[automerger skipped] Merge "emulator sdk_phone_x86/_64: Add EmulatorSmokeTests" am: 562a82f521 -s ours

am: dd9e7e8ddb  -s ours

Change-Id: I87834eb2b5228fdd1abafe5e463c67b3a7a08ce4
This commit is contained in:
Yifan Hong
2018-06-20 15:34:05 -07:00
committed by android-build-merger

Diff Content Not Available