| commit | 1e1681db51e87c08b88dd5ffd961eb815b5aeb86 | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Wed Jun 04 16:55:52 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 16:55:52 2014 +0000 |
| tree | 07fba5e025f8c03b7ba9b2f37ca82cc4cec59f0f | |
| parent | 1d6506ca4bb62a8f66cf5f0a72bde096115e757a [diff] | |
| parent | 008dc16cb06976620c0fa1e51942f2d1c6af54f3 [diff] |
am 008dc16c: (-s ours) DO NOT MERGE: Combine emulator test projects into a single apk * commit '008dc16cb06976620c0fa1e51942f2d1c6af54f3': DO NOT MERGE: Combine emulator test projects into a single apk