| commit | d6e6f97a8e015f39e40e434d7a5ab0d1eadcd691 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Wed Jun 04 18:27:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 18:27:18 2014 +0000 |
| tree | 07fba5e025f8c03b7ba9b2f37ca82cc4cec59f0f | |
| parent | 5de36c46d84eeb944646fe5413502f8aabcc76c3 [diff] | |
| parent | e8e7ebbde46df2a4dafc4c90a53abd911d1255ec [diff] |
am e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk"" * commit 'e8e7ebbde46df2a4dafc4c90a53abd911d1255ec': Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""