commit | f0f4ee250d2599515eedfe3a81d4d0892efd4f80 | [log] [tgz] |
---|---|---|
author | Paul Duffin <paulduffin@google.com> | Tue Jul 12 09:41:24 2016 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jul 12 09:41:24 2016 +0000 |
tree | a3078a9a2ce95ff3d7d805ad093a4dc015cccee6 | |
parent | f2c6c851d2eb349729613906aeb96370a04fa460 [diff] | |
parent | 8cbd3b198dd624461a3b1e3e08c6d9d5e620fedf [diff] |
Merge changes from topic 'mockito-without-junit' * changes: Use mockito-target-minus-junit4. android.core.tests.libcore.package.tests: add mockito to the dependencies