tree 620a697913f27f9982d5ae5d2109eb79cbfc1b3e
parent 5671e6140712c6364aecefa6cca390aa82abbc18
parent 7901714521fa00aa51db48d7ee79df6e978a639e
author Alex Light <allight@google.com> 1541548480 -0800
committer android-build-merger <android-build-merger@google.com> 1541548480 -0800

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

Change-Id: I2eb72a34d8fa13514ad8946937972a725638711c