OSDN Git Service

am a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into...
authorQiwen Zhao <zhao@google.com>
Wed, 4 Jun 2014 17:12:13 +0000 (17:12 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 17:12:13 +0000 (17:12 +0000)
* commit 'a5abefbbb527490dd76e34780dc2bfc6ed6a437d':
  Revert "DO NOT MERGE: Combine emulator test projects into a single apk"


Trivial merge