| commit | 97f49221add746c1a385a4086054682e7d3a3353 | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Tue Jun 17 17:34:43 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jun 17 04:56:28 2014 +0000 |
| tree | 5ee98a6dd6d83799f3408e0cba91d47d5e314b95 | |
| parent | 2eb95ac202429d930545043d742ab443bedbf357 [diff] | |
| parent | 16e2e047302ba716cc61fa59ccd88cf8a1e42ccb [diff] |
Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master