tree 68ff6d4174ba8cdcba4b210d8ff8ae5110bbdfbb
parent e6e84a5067933c8baa46918559648d101bff5837
parent dd63e299258273569c03417ea24ec316734ab77f
author David Pursehouse <dpursehouse@collab.net> 1559259727 +0900
committer David Pursehouse <dpursehouse@collab.net> 1559259727 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.28.2

Change-Id: Id63a6410f137ac320b700798986171b49531305d