tree e714c0d501a7befd95a104b704cefd096ae5987a
parent 4aa7dd9f6bdb9c5d0cf5e4fa6b376581f93052b3
parent 018645fa21a08ebd948f92a4f953ed29fa31f2e8
author David Pursehouse <dpursehouse@collab.net> 1543195415 +0900
committer David Pursehouse <dpursehouse@collab.net> 1543195415 +0900

Merge branch 'stable-2.15'

* stable-2.15:
  Update mockito to 2.23.4

Change-Id: I84bd18bccf0ac09aaf41137c357c8f3b45aaea1c