tree 7dcc4107f413941bd06c429c25525b7e95bea840
parent f40eeb4a18678e782ce7e00b28c6b9617bf85c2c
parent 5bb1e8c9bc415d2be80524de2e43706e5c58d96a
author Alex Light <allight@google.com> 1541547886 -0800
committer android-build-merger <android-build-merger@google.com> 1541547886 -0800

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

Change-Id: Ib8c6436b72d0cbb7133a9a2b0586f8263adf598e