tree 662052c37f89e5a71732ed68896861d5c1f42271
parent e579f747fa0dae13ba020988efdaff8bd422148f
parent df78b4ceefd4859ce1789f0daedce9d1bdaebfce
author David Pursehouse <dpursehouse@collab.net> 1554784508 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554784508 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: I04877223869de8f17eebe1aa2ac1e2dbd24770f9