| commit | 71ce4f8dcd08608dda26cd6a9f6d13587f4c9ad7 | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Wed Jun 04 17:36:33 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 17:36:33 2014 +0000 |
| tree | 2f6b47dee3db30aa5b4482abe378a4d8a17c114b | |
| parent | 12debe574847a6c729309b913fa6a00786efe9ad [diff] | |
| parent | eed384a9b869b9238dd480e048988b2b35c53a66 [diff] |
am eed384a9: (-s ours) am 5de36c46: (-s ours) am a5abefbb: (-s ours) Revert "DO NOT MERGE: Combine emulator test projects into a single apk" * commit 'eed384a9b869b9238dd480e048988b2b35c53a66': Revert "DO NOT MERGE: Combine emulator test projects into a single apk"