commit | 9e3259f50d6aa2ca4430430d71d2fffd58662650 | [log] [tgz] |
---|---|---|
author | David 'Digit' Turner <digit@google.com> | Sun May 11 09:19:43 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sun May 11 09:19:43 2014 +0000 |
tree | 6f92b699cd4ec133ed8e98972c8be704b9b03c57 | |
parent | c581e10a2b6f54e6f6b24dbd3e5fb10cdf3c77eb [diff] | |
parent | fb67f05d3d6deb2400fd09390550a7858a3c3158 [diff] |
am fb67f05d: Merge changes I53b2ada9,I30794ea5 * commit 'fb67f05d3d6deb2400fd09390550a7858a3c3158': Disable emulator from platform builds. envsetup.sh: Use prebuilt emulator binaries if available.