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