tree fe118265d154ecaf60663126b807da8890976bf1
parent feab4dcdd7c7ce120a9f671127f62a96eb424526
parent db20bbcc82de39f499a804d215851995041f3bcf
author Paul Duffin <paulduffin@google.com> 1489748314 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1489748315 +0000

Merge changes from topic 'upgrade-mockito-2.7.13'

* changes:
  Reapply - Hacks to allow mocking of package private classes
  Update to version 2.2.0 and make it build