| commit | 90b089de4c1e9ffe3bc13c7aa615c75579214abd | [log] [tgz] |
|---|---|---|
| author | Steve Moyer <smoyer@google.com> | Fri Apr 04 16:36:18 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Apr 04 16:36:18 2014 +0000 |
| tree | ae1fee5583ace4a17be4f19eb05e673bf18f443d | |
| parent | 680e037007fd0f4207a4734b8fccce17a91ee682 [diff] | |
| parent | b9d6f6f15c7ea54a55f892654a450fff609b1f5f [diff] |
am b9d6f6f1: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" * commit 'b9d6f6f15c7ea54a55f892654a450fff609b1f5f': DO NOT MERGE: Combine emulator test projects into a single apk