Merge changes from topic "aosp-emulator-oc" am: 35149ca0b7 -s ours am: 8c5471250e

am: 6268f7c752  -s ours

Change-Id: I293842cefc5fb0b53466ccb9867c4243acd54bac
This commit is contained in:
Bo Hu 2017-09-01 00:31:06 +00:00 committed by android-build-merger
commit 8f8ce7025b

Diff Content Not Available