Merge "Move emulator specific configurations to vendor" am: 8930bf679b

am: 4d8e808a0b  -s ours

Change-Id: I8088efbae393871ebe02546c56f6cfea520e0681
This commit is contained in:
Isaac Chen 2017-11-06 22:00:04 +00:00 committed by android-build-merger
commit 5cd6fd64fb

Diff Content Not Available