tree 56cf56f290aad84660a6efdd71d9cae1ac3c8f82
parent a686258e1d20aa5d08b6ee6c26c958c81b64ba95
parent 0b9ce7db88cfa4b00f5afd4f42995e011eaebb5a
author David Pursehouse <dpursehouse@collab.net> 1550636181 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550636181 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: I3d81a5fe1066feaff9d6a7fd0dae5ca0a584b059