| commit | fffe639a69c843fe48de58a4ff74c80eacc03c70 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Aug 23 16:53:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 16:53:28 2016 +0000 |
| tree | 5353c7b9fa8369678d573942be2db7027cc8b2f4 | |
| parent | 80187c4d9c7ce57c573a31517aafc157bbbdc967 [diff] | |
| parent | b88e3d809c4f7a9a2d61bc14a74eb2edf330c064 [diff] |
add workaround for annotations dependency conflict with espresso am: eee3518d11 am: b5971ef610 am: b88e3d809c Change-Id: I3e08bdcf2a62d5125b325a83a729a0fbd34785dd