OSDN Git Service

am d6e6f97a: (-s ours) am e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine...
authorQiwen Zhao <zhao@google.com>
Wed, 4 Jun 2014 18:52:14 +0000 (18:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Jun 2014 18:52:14 +0000 (18:52 +0000)
commitc3136cd9988c9d1891751e9d64d714bb12c82d7f
treeeb08a66ec5e39532347d18922c1d2611c1cb5337
parente8dc18680f107ea3f5c6f9376f496063c292cd98
parentd6e6f97a8e015f39e40e434d7a5ab0d1eadcd691
am d6e6f97a: (-s ours) am e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""

* commit 'd6e6f97a8e015f39e40e434d7a5ab0d1eadcd691':
  Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""