Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 50a7f9c1 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: f8a0cb29 am: 0ea21992
am: 97a3ed97

Change-Id: I91fb3c4a04e3c1b8f71aec3f8db6e28467ad0810
parents d92c70ff 97a3ed97
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