| commit | f8a0cb29647d01086b1f65304c55279bb2cff1b1 | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Tue Aug 23 15:47:18 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 23 15:47:18 2016 +0000 |
| tree | 12061ea7563b5a4d92b3bfbf809615a44471b874 | |
| parent | 349edcf1699828a86d3a4d27854cb39bb8a5f9a5 [diff] | |
| parent | 77917a835f5ca315da544a49e533f3cc5575d05d [diff] |
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am: 77917a835f Change-Id: Ibc54a5b58aad47a49bf5cb5a69ae3ddf461ccd15