tree f744495334b236c55bd59a1969eea5868d59fbca
parent 167b7fadca0d71c220168201de073aeaf4b4d716
parent 39d05f6d0592d626f13148933fc2432b7704701d
author David Pursehouse <dpursehouse@collab.net> 1554784507 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554784507 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Upgrade mockito-core to 2.26.0

Change-Id: I149c6a26837dfa9bf8b2d895cba8564be1121d7a