tree 457284c370e65988e18a63929c6956b5607f09c8
parent e1b920f599a164633a1989a42d81e54ed63aefa5
parent 456d2927a633bed18639a4275309a94a3489e812
author Colin Cross <ccross@android.com> 1508813198 +0000
committer android-build-merger <android-build-merger@google.com> 1508813198 +0000

Merge "Convert external/mockito to Android.bp"
am: 456d2927a6

Change-Id: I556e70dba6a84145551a34894daf68f2549a3d36