tree 6a287d02bd71f33287adc2f0364279a1b4080357
parent 04c80a3b336ff8a4497c68af28b25031a7e6472b
parent 11b015b629ea668794d46872489f35367e9e551f
author Anthony Hugh <ahugh@google.com> 1559257382 -0700
committer android-build-merger <android-build-merger@google.com> 1559257382 -0700

Merge "Fix mockito dependency" into qt-dev
am: 11b015b629

Change-Id: I77fe40ebe9f3ab53ab7c3de10205b41b4991dece