tree 12061ea7563b5a4d92b3bfbf809615a44471b874
parent 349edcf1699828a86d3a4d27854cb39bb8a5f9a5
parent 77917a835f5ca315da544a49e533f3cc5575d05d
author Scott Main <smain@google.com> 1471967238 +0000
committer android-build-merger <android-build-merger@google.com> 1471967238 +0000

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

Change-Id: Ibc54a5b58aad47a49bf5cb5a69ae3ddf461ccd15