| commit | b88e3d809c4f7a9a2d61bc14a74eb2edf330c064 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Aug 23 15:56:11 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 15:56:11 2016 +0000 |
| tree | b5e5a5d5e3996f4fb66bd60701a1419cda97f60f | |
| parent | 6e2470a6d4ed5e67e8c1c0e2ee6d2e57119a6434 [diff] | |
| parent | b5971ef61059f21e67a4857778273437446b43b2 [diff] |
add workaround for annotations dependency conflict with espresso am: eee3518d11 am: b5971ef610 Change-Id: Ie4f93ff85ad67fb048460a49937cbf55db575262