OSDN Git Service

am 1e1681db: (-s ours) am 008dc16c: (-s ours) DO NOT MERGE: Combine emulator test...
authorSteve Moyer <smoyer@google.com>
Wed, 4 Jun 2014 17:28:51 +0000 (17:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 17:28:51 +0000 (17:28 +0000)
commit2664e5f02c79c18a1286fde0454f98361d08d42c
tree70addb8b1d1ba032be183727b03d58971b52c498
parentf092f7fd2dc1a7b0cb602e69d78f492edacf541d
parent1e1681db51e87c08b88dd5ffd961eb815b5aeb86
am 1e1681db: (-s ours) am 008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk

* commit '1e1681db51e87c08b88dd5ffd961eb815b5aeb86':
  DO NOT MERGE: Combine emulator test projects into a single apk