OSDN Git Service

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


Trivial merge