commit 40a3dd85ebd10b1adb4e52338f6bce1f119e3235
author Garfield Tan <xutan@google.com> Tue Sep 10 15:29:53 2019 -0700
committer Garfield Tan <xutan@google.com> Tue Sep 10 15:37:01 2019 -0700
tree e421f47e90eaf63d948164fe0ab52e22635897e1
parent f3427490718493b3887e1ce8449e3f39421bf964

Reland "Update to Mockito 2.25.0 and impl InlineMockMaker."

This reverts commit af29ec14cc2419ba013ffd2f66ee26b5541d098d.

Bug: 140773999
Test: Builds.
Change-Id: I76ce490869000e95f62f7dc9ff0c8fa013dabc71

README.version

diff --git a/README.version b/README.version
index ee1122d..d51834c 100644
--- a/README.version
+++ b/README.version
@@ -15,3 +15,4 @@
         Temporarily ignore failing test (Ibf7b6c2eb05c5ff83f0817f9224369e20c0b775d)
         Restrict InspectClass to current thread. (Ic62951ff81bed60ac7512455fad65210e4b728a9, need upstreaming)
         Exclude Stress#mockALot from presubmit (Ic9a2927ffa07924bd759429e31c56dc1b71a826c)
+        Update to Mockito 2.25.0 and impl InlineMockMaker (29a8674036d345e4ec8635b1d38d8b2a4fe91980a, need upstreaming)