| commit | e0ab08dbb1e3abc4e0c5092a4fcd2c42ed4fd43c | [log] [tgz] |
|---|---|---|
| author | Philip P. Moltmann <moltmann@google.com> | Tue Aug 28 12:03:50 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Aug 28 12:03:50 2018 -0700 |
| tree | 8cf99ff02592dbd8053b56f31fc604500444699c | |
| parent | c0d30fba606622ca43b9f02dff00b9e918351aac [diff] | |
| parent | bf3ba3972aeac52dc0eabb0c262e1b4da25d7be1 [diff] |
Merge "Revert "Revert "Update mockito on AOSP to same version as on internal master""" am: bf3ba3972a Change-Id: I910f3bea560bbf2afcb2088f688fc221edca5d85