tree 9462c3548b22660af4b00335c1f502f1718f5b70
parent df78b4ceefd4859ce1789f0daedce9d1bdaebfce
parent 3f7ed58f572eabb2ec5cabf258f68c9a38592a90
author David Pursehouse <dpursehouse@collab.net> 1555031025 +0900
committer David Pursehouse <dpursehouse@collab.net> 1555031025 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.27.0

Change-Id: I562ca815b2fb384d9b1e64202aefad2ea80daeda