OSDN Git Service

am 97f49221: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a...
authorSteve Moyer <smoyer@google.com>
Tue, 17 Jun 2014 17:39:26 +0000 (17:39 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Jun 2014 17:39:26 +0000 (17:39 +0000)
commit7091bbf92ac8d80a664cb347b7f65899f0ba36eb
tree4de89e186d688d38b9ffe9c1b2b4466f5c48db28
parentf9172a61d742ac048fced2c264585068a42527b3
parent97f49221add746c1a385a4086054682e7d3a3353
am 97f49221: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master

* commit '97f49221add746c1a385a4086054682e7d3a3353':
  DO NOT MERGE: Combine emulator test projects into a single apk