| commit | eed384a9b869b9238dd480e048988b2b35c53a66 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Wed Jun 04 17:29:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 17:29:03 2014 +0000 |
| tree | 70addb8b1d1ba032be183727b03d58971b52c498 | |
| parent | 67d25adb9fb8f744b9c03a999b9474774167402a [diff] | |
| parent | 5de36c46d84eeb944646fe5413502f8aabcc76c3 [diff] |
am 5de36c46: (-s ours) am a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk" * commit '5de36c46d84eeb944646fe5413502f8aabcc76c3': Revert "DO NOT MERGE: Combine emulator test projects into a single apk"