| commit | 0ea21992e75a446c55587ca2b87e2a4c81381f09 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Aug 23 15:56:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 15:56:15 2016 +0000 |
| tree | 71976e2fde7e92a1c357f41294a677b228dfb998 | |
| parent | da2802d1f9fa02cb072d5cba5336ecb52f0a29c3 [diff] | |
| parent | f8a0cb29647d01086b1f65304c55279bb2cff1b1 [diff] |
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am: 77917a835f am: f8a0cb2964 Change-Id: Ifff17568fd5ac67443fa7cfbbb0526f0b16b3c34