am d6e6f97a: (-s ours) am e8e7ebbd: (-s ours) Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""

Browse Source

* commit 'd6e6f97a8e015f39e40e434d7a5ab0d1eadcd691':
  Revert "Revert "DO NOT MERGE: Combine emulator test projects into a single apk""

...

This commit is contained in:

Qiwen Zhao

2014-06-04 18:52:14 +00:00

committed by Android Git Automerger

parent e8dc18680f d6e6f97a8e

commit c3136cd998

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available