tree e421f47e90eaf63d948164fe0ab52e22635897e1
parent e59c40a8cb8c2f9723d4f6106998fe8914c4b66e
parent 40a3dd85ebd10b1adb4e52338f6bce1f119e3235
author Treehugger Robot <treehugger-gerrit@google.com> 1568162812 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1568162812 +0000

Merge changes from topic "mockito-dexmaker-update-revert"

* changes:
  Reland "Update to Mockito 2.25.0 and impl InlineMockMaker."
  Reland "Restrict InspectClass to current thread."
  Revert "Update dexmaker to latest master."