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

Browse Source

am: 97a3ed97c5

Change-Id: I91fb3c4a04e3c1b8f71aec3f8db6e28467ad0810

...

This commit is contained in:

Scott Main

2016-08-23 18:03:13 +00:00

committed by android-build-merger

parent d92c70ffd3 97a3ed97c5

commit 50a7f9c169

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