tree 1ac0fe13aa4b3e3413ea401eb7e97da7f6496f98
parent 90ce934574a17d9e5dd74a396d522310d25cbc00
parent ed576679f62dc5415b82b0d19c2a6550e0d6e28f
author David Pursehouse <dpursehouse@collab.net> 1554774397 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554774397 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade mockito-core to 2.26.0

Change-Id: Icb73272822707384986a938b7e878279723eb214