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

Browse Source

am: f8a0cb2964

Change-Id: Ifff17568fd5ac67443fa7cfbbb0526f0b16b3c34

...

This commit is contained in:

Scott Main

2016-08-23 15:56:15 +00:00

committed by android-build-merger

parent da2802d1f9 f8a0cb2964

commit 0ea21992e7

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