tree b5e5a5d5e3996f4fb66bd60701a1419cda97f60f
parent b88e3d809c4f7a9a2d61bc14a74eb2edf330c064
parent 759c2855e8335a23b10ec3ccb64700a9e8e7f6e7
author Scott Main <smain@google.com> 1471967774 +0000
committer android-build-merger <android-build-merger@google.com> 1471967774 +0000

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

Change-Id: I4e70f6d857e76dc66e3b0d10cf9620dc62937b0b