| commit | 0bbc014ed7313fac40041a05a45418201b0c0273 | [log] [tgz] |
|---|---|---|
| author | smain@google.com <smain@google.com> | Tue Aug 23 22:29:31 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 22:29:31 2016 +0000 |
| tree | 9892f9bf3ae12f5aa51425cb0fc4a56c8be5faf5 | |
| parent | 3fa72ffa62bf9625948419a537c97e75c7c7772f [diff] | |
| parent | 50a7f9c169b049cd9ff1b268df3b3b7b55d3e0b3 [diff] |
add workaround for annotations dependency conflict with espresso am: eee3518d11 am: 349edcf169 am: da2802d1f9 am: 3e133f7e78 am: 50a7f9c169 Change-Id: I10d8c7cf54585ab196a4a1b334124ea0fac5ae0f