tree 38c6dc8d464bf9d001820f0f93a8ecf773a0f068
parent 00d6a1102344b50741813edbd8b38ee46433e03e
parent 830015cf83272693a8f657a4107be59b7d3b6be4
author David Pursehouse <dpursehouse@collab.net> 1550636177 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550636177 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update mockito-core to 2.24.5

Change-Id: Ib90ee6d5f3d7b88e86c2249c7ee5ecd7d49f2605