commit | af7e75512eba16d5036a78e2eb685b5e2173b5e0 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Thu Mar 07 19:29:41 2019 +0900 |
committer | David Pursehouse <dpursehouse@collab.net> | Thu Mar 07 19:29:41 2019 +0900 |
tree | fb30add13b8d4e272a9d064375b2f5582834ddf3 | |
parent | 008fde683e94c634e7a3cb84efdf979881644270 [diff] | |
parent | 9866bed1349573be3224c86af11d6cec5626c2dd [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Upgrade mockito-core to 2.25.0 Change-Id: I420df1c81fa1aa0d3d55899ce84e034ddfd5f941