| commit | 7091bbf92ac8d80a664cb347b7f65899f0ba36eb | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Tue Jun 17 17:39:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 17 17:39:26 2014 +0000 |
| tree | 4de89e186d688d38b9ffe9c1b2b4466f5c48db28 | |
| parent | f9172a61d742ac048fced2c264585068a42527b3 [diff] | |
| parent | 97f49221add746c1a385a4086054682e7d3a3353 [diff] |
am 97f49221: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master * commit '97f49221add746c1a385a4086054682e7d3a3353': DO NOT MERGE: Combine emulator test projects into a single apk