Skip to content
Commit b88e3d80 authored by smain@google.com's avatar smain@google.com Committed by android-build-merger
Browse files

add workaround for annotations dependency conflict with espresso am: eee3518d 

am: b5971ef6

Change-Id: Ie4f93ff85ad67fb048460a49937cbf55db575262
parents 6e2470a6 b5971ef6
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