tree a3078a9a2ce95ff3d7d805ad093a4dc015cccee6
parent f2c6c851d2eb349729613906aeb96370a04fa460
parent 8cbd3b198dd624461a3b1e3e08c6d9d5e620fedf
author Paul Duffin <paulduffin@google.com> 1468316484 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1468316484 +0000

Merge changes from topic 'mockito-without-junit'

* changes:
  Use mockito-target-minus-junit4.
  android.core.tests.libcore.package.tests: add mockito to the dependencies