OSDN Git Service

am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5
authorDavid 'Digit' Turner <digit@google.com>
Sun, 11 May 2014 09:23:35 +0000 (09:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 11 May 2014 09:23:35 +0000 (09:23 +0000)
commit873782ccd44349c766f5d74e65b3b323618dd6ed
tree45348fa11559c33d5bc8eeb240ea02914d9257b4
parent17b3567b064fa8d8637113c49014494e25241aa6
parent9e3259f50d6aa2ca4430430d71d2fffd58662650
am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5

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