| commit | e558e568c08588edfc706e3c82d29b78c4af7d4a | [log] [tgz] |
|---|---|---|
| author | Scott Main <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 | b5e5a5d5e3996f4fb66bd60701a1419cda97f60f | |
| parent | b88e3d809c4f7a9a2d61bc14a74eb2edf330c064 [diff] | |
| parent | 759c2855e8335a23b10ec3ccb64700a9e8e7f6e7 [diff] |
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am: 77917a835f am: 759c2855e8 Change-Id: I4e70f6d857e76dc66e3b0d10cf9620dc62937b0b