| commit | 873782ccd44349c766f5d74e65b3b323618dd6ed | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Sun May 11 09:23:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun May 11 09:23:35 2014 +0000 |
| tree | 45348fa11559c33d5bc8eeb240ea02914d9257b4 | |
| parent | 17b3567b064fa8d8637113c49014494e25241aa6 [diff] | |
| parent | 9e3259f50d6aa2ca4430430d71d2fffd58662650 [diff] |
am 9e3259f5: am fb67f05d: Merge changes I53b2ada9,I30794ea5 * commit '9e3259f50d6aa2ca4430430d71d2fffd58662650': Disable emulator from platform builds. envsetup.sh: Use prebuilt emulator binaries if available.