| commit | da2802d1f9fa02cb072d5cba5336ecb52f0a29c3 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Aug 23 15:56:14 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 15:56:14 2016 +0000 |
| tree | 71976e2fde7e92a1c357f41294a677b228dfb998 | |
| parent | a1e4149cfd2f4db0a066c62d1a24053e07b29942 [diff] | |
| parent | 349edcf1699828a86d3a4d27854cb39bb8a5f9a5 [diff] |
add workaround for annotations dependency conflict with espresso am: eee3518d11 am: 349edcf169 Change-Id: I178c7bc7c2639559e8b4848f1a2af0bcdffcc849