Skip to content
Commit f8a0cb29 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 nyc-dev 

am: 77917a83

Change-Id: Ibc54a5b58aad47a49bf5cb5a69ae3ddf461ccd15
parents 349edcf1 77917a83
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