Skip to content
Commit 77917a83 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev

parents c069ed7f eee3518d
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