| commit | 19a7f868760669f8a23007ae6408866d632015de | [log] [tgz] |
|---|---|---|
| author | Qiwen Zhao <zhao@google.com> | Wed Jun 04 18:55:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 04 18:55:21 2014 +0000 |
| tree | ede48bc6fbc7138a04e6673b277ec55f97cd7589 | |
| parent | 83d91e34090126e6eb8b1d329f7eebaf97b57c7f [diff] | |
| parent | c3136cd9988c9d1891751e9d64d714bb12c82d7f [diff] |
am c3136cd9: (-s ours) am d6e6f97a: (-s ours) am e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk"" * commit 'c3136cd9988c9d1891751e9d64d714bb12c82d7f': Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""