tree cc25b1919868db1ee80ff2688d5894998029fb9d
parent ec2d8665a0ff31b1c26d24e05ebd87d553bbc25c
parent 70209552da64684311eb278d500242ab21d8d172
author David Pursehouse <dpursehouse@collab.net> 1554774387 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554774387 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: I80351addabd623b9d37c426463ad5e7126c7e92b