tree d9e5dc4798724bf7dbde7adb7a5cce14b9037363
parent 7486fe66ef90b565448d53cef266450844695606
parent 8ce36c099e9f156882fbd0cb5314082c547f67ff
author Narayan Kamath <narayan@google.com> 1468316745 +0000
committer android-build-merger <android-build-merger@google.com> 1468316745 +0000

Merge \"Add mockito-target-minus-junit4.\"
am: 8ce36c099e

Change-Id: I2cd84744279b197a15ebddab9e4c5b8f7129b5cb