tree 2832ce47bab5b08db77be1a951f4dfdf161404d2
parent e1219c73ef01f47eae989e41771b717fa5c7145e
parent 756d5ae29a8d1f96ff9296a4bb38219a4d39550b
author Alex Light <allight@google.com> 1541549513 -0800
committer android-build-merger <android-build-merger@google.com> 1541549513 -0800

Merge "Correct illegal mockito usage." am: 5bb1e8c9bc am: 7901714521
am: 756d5ae29a

Change-Id: Ibae90ae05b36129a34a358bb60ffd7ad23e3c4a4