| commit | 759c2855e8335a23b10ec3ccb64700a9e8e7f6e7 | [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 | 63455713f5c4049743c79a6b40703419c7c59e5a | |
| parent | b5971ef61059f21e67a4857778273437446b43b2 [diff] | |
| parent | 77917a835f5ca315da544a49e533f3cc5575d05d [diff] |
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev am: 77917a835f Change-Id: Id3b88a94a23de579c20757f038dd83c0645e67bc