| commit | 2482da64f875566a4a0bf30ac2a45ed860efeb1d | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Fri Apr 04 16:42:57 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 16:42:57 2014 +0000 |
| tree | a0979d3d765109d279f7371759938c28afa029ba | |
| parent | 88e1a1103acaf5e61fd11a7c006a0c465214ac78 [diff] | |
| parent | 90b089de4c1e9ffe3bc13c7aa615c75579214abd [diff] |
am 90b089de: (-s ours) am b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" * commit '90b089de4c1e9ffe3bc13c7aa615c75579214abd': DO NOT MERGE: Combine emulator test projects into a single apk