OSDN Git Service

am edc702c7: am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5
authorDavid 'Digit' Turner <digit@google.com>
Sun, 11 May 2014 09:36:21 +0000 (09:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sun, 11 May 2014 09:36:21 +0000 (09:36 +0000)
commitfc4e2bc5023f26cae2b6c209c5880956d548d046
tree3be03f383744957a33f24feb73ad873463a95118
parenta4cb2d99a341af8027c8194aadcfd5c1dd7b0933
parentedc702c7d6d44222a30fad5492aca916d48f0da2
am edc702c7: am 873782cc: am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5

* commit 'edc702c7d6d44222a30fad5492aca916d48f0da2':
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.