Merge "Refactor code incompatible with Mockito 2.7.13"
authorPaul Duffin <paulduffin@google.com>
Fri, 10 Mar 2017 07:33:55 +0000 (07:33 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 10 Mar 2017 07:33:56 +0000 (07:33 +0000)
commit92851f849f639f77388da8d5aaad8650693342f7
treef69b3e7faa323d2d382d860b42c02e9f76a3bdf0
parent995e90e58b431279745d8891447690ebce292165
parentf9339819516dbe67fb8fcef846a0ae4441ef17bd
Merge "Refactor code incompatible with Mockito 2.7.13"