tree 2f6b47dee3db30aa5b4482abe378a4d8a17c114b
parent 3ca25da84e26b8f7d8aad915d97a8238c355b39d
parent 2664e5f02c79c18a1286fde0454f98361d08d42c
author Steve Moyer <smoyer@google.com> 1401903391 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401903391 +0000

am 2664e5f0: (-s ours) am 1e1681db: (-s ours) am 008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk

* commit '2664e5f02c79c18a1286fde0454f98361d08d42c':
  DO NOT MERGE: Combine emulator test projects into a single apk