tree 36c91aa02fb88ceb1aefd137518ffdeb23ba85ee
parent 0e18dcd34ba11344cd0dd08d090e9cb9d7cdc11b
parent a42c0a02a34c7538e9b8c42b7db891d276d89793
author Xavier Ducrohet <xav@google.com> 1403200061 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403200061 +0000

am a42c0a02: am e7186b26: Merge "Add emulator launcher to prebuilts." into idea133 automerge: 8b19290

* commit 'a42c0a02a34c7538e9b8c42b7db891d276d89793':
  Add emulator launcher to prebuilts.