OSDN Git Service

am 2664e5f0: (-s ours) am 1e1681db: (-s ours) am 008dc16c: (-s ours) DO NOT MERGE...
authorSteve Moyer <smoyer@google.com>
Wed, 4 Jun 2014 17:36:31 +0000 (17:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 17:36:31 +0000 (17:36 +0000)
commit356daf47ec4a8685f749252b0d79a41d5700f19a
tree2f6b47dee3db30aa5b4482abe378a4d8a17c114b
parent3ca25da84e26b8f7d8aad915d97a8238c355b39d
parent2664e5f02c79c18a1286fde0454f98361d08d42c
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