OSDN Git Service

am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5
authorDavid 'Digit' Turner <digit@google.com>
Sun, 11 May 2014 09:28:16 +0000 (09:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 11 May 2014 09:28:16 +0000 (09:28 +0000)
commitedc702c7d6d44222a30fad5492aca916d48f0da2
tree1c2a3b00723f7e5d0ed6c13ba43658e5ddcdf796
parentbd58064a62ecc57056e35c09bc3144f8f44ae4c2
parent873782ccd44349c766f5d74e65b3b323618dd6ed
am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5

* commit '873782ccd44349c766f5d74e65b3b323618dd6ed':
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.
core/main.mk
envsetup.sh