Skip to content
Commit e558e568 authored by Scott Main's avatar Scott Main Committed by android-build-merger
Browse files

Merge "add workaround for annotations dependency conflict with espresso" into... 

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

Change-Id: I4e70f6d857e76dc66e3b0d10cf9620dc62937b0b
parents b88e3d80 759c2855
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment