Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev

Browse Source

am: 77917a835f

Change-Id: Ibc54a5b58aad47a49bf5cb5a69ae3ddf461ccd15

...

This commit is contained in:

Scott Main

2016-08-23 15:47:18 +00:00

committed by android-build-merger

parent 349edcf169 77917a835f

commit f8a0cb2964

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