tree 8cf99ff02592dbd8053b56f31fc604500444699c
parent c0d30fba606622ca43b9f02dff00b9e918351aac
parent bf3ba3972aeac52dc0eabb0c262e1b4da25d7be1
author Philip P. Moltmann <moltmann@google.com> 1535483030 -0700
committer android-build-merger <android-build-merger@google.com> 1535483030 -0700

Merge "Revert "Revert "Update mockito on AOSP to same version as on internal master"""
am: bf3ba3972a

Change-Id: I910f3bea560bbf2afcb2088f688fc221edca5d85