| commit | 67d25adb9fb8f744b9c03a999b9474774167402a | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Wed Jun 04 17:28:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 17:28:52 2014 +0000 |
| tree | 70addb8b1d1ba032be183727b03d58971b52c498 | |
| parent | 2664e5f02c79c18a1286fde0454f98361d08d42c [diff] | |
| parent | c653faa88717b0ca5e97b39a4016399d7a67549f [diff] |
am c653faa8: (-s ours) am 37773821: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk * commit 'c653faa88717b0ca5e97b39a4016399d7a67549f': DO NOT MERGE: Combine emulator test projects into a single apk