| commit | c3136cd9988c9d1891751e9d64d714bb12c82d7f | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Wed Jun 04 18:52:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 18:52:14 2014 +0000 |
| tree | eb08a66ec5e39532347d18922c1d2611c1cb5337 | |
| parent | e8dc18680f107ea3f5c6f9376f496063c292cd98 [diff] | |
| parent | d6e6f97a8e015f39e40e434d7a5ab0d1eadcd691 [diff] |
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""