| commit | 3e133f7e7801581e705465fc784cb23029f0b247 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Aug 23 16:19:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 16:19:14 2016 +0000 |
| tree | 0e015a73bc7435ddb32377b1aecb39bb189f9e9e | |
| parent | 39993c3b9debe1b8b4e6ef4c4f0bb326c9c14a74 [diff] | |
| parent | da2802d1f9fa02cb072d5cba5336ecb52f0a29c3 [diff] |
add workaround for annotations dependency conflict with espresso am: eee3518d11 am: 349edcf169 am: da2802d1f9 Change-Id: Ia7d3ce025d564c188544fa11950ac89dd1aa12e2