| commit | d92c70ffd39a8fb591b88cf82f56573c01235cfe | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Aug 23 18:03:06 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 18:03:06 2016 +0000 |
| tree | a29f3eb60d49f8270593094cf9ac5dfbd919a61e | |
| parent | bb1619f7951c60d69c112f79e53af3485b68b044 [diff] | |
| parent | 3e133f7e7801581e705465fc784cb23029f0b247 [diff] |
add workaround for annotations dependency conflict with espresso am: eee3518d11 am: 349edcf169 am: da2802d1f9 am: 3e133f7e78 Change-Id: Ib9bef3c18fe142816ebbe6f5c4768c88c6063133