tree 059d461d54d1f09c9cc434e3872b75815b1acbae
parent 024088f9ed1e735aa0af42d024c52a735f640b6d
parent c9f6945feb07ccc487225881d82d64d07fc0c89e
author David Pursehouse <dpursehouse@collab.net> 1554784510 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554784510 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: I953a302e63124b7ba5d301d3172000ec87c1d67e