OSDN Git Service

Merge changes I53b2ada9,I30794ea5
authorDavid 'Digit' Turner <digit@google.com>
Sun, 11 May 2014 09:16:15 +0000 (09:16 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Sun, 11 May 2014 09:16:16 +0000 (09:16 +0000)
commitfb67f05d3d6deb2400fd09390550a7858a3c3158
tree970eb194ff54e1b776f0cda921ca242ffd7f1208
parenteca0043b869cb10792e2f3e79d4714bde2945bac
parentf6e2694dd24d54a93d3c9adb633e0776cedb1049
Merge changes I53b2ada9,I30794ea5

* changes:
  Disable emulator from platform builds.
  envsetup.sh: Use prebuilt emulator binaries if available.