Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am: 77917a835f am: f8a0cb2964

Browse Source

am: 0ea21992e7

Change-Id: Ib50e5c0fb691fecaca450b9713c90aa1a7818c28

...

This commit is contained in:

Scott Main

2016-08-23 16:19:17 +00:00

committed by android-build-merger

parent 3e133f7e78 0ea21992e7

commit 97a3ed97c5

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