am 97f49221: (-s ours) Merge "DO NOT MERGE: Combine emulator test projects into a single apk" into stage-aosp-master

Browse Source

* commit '97f49221add746c1a385a4086054682e7d3a3353':
  DO NOT MERGE: Combine emulator test projects into a single apk

...

This commit is contained in:

Steve Moyer

2014-06-17 17:39:26 +00:00

committed by Android Git Automerger

parent f9172a61d7 97f49221ad

commit 7091bbf92a

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