commit | 60aed93adbfae23e512d74b1923a508ddfb00dfa | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Tue Mar 19 17:09:48 2019 +0000 |
committer | David Pursehouse <dpursehouse@collab.net> | Tue Mar 19 17:09:48 2019 +0000 |
tree | cf2baa2733dcc0f66e658f94e5e51c2d521a5799 | |
parent | 5e20b1d26d7586c9ddce0955f242a93aa8f75710 [diff] | |
parent | a40f2c3a8f35272d3e8df65efc92fbbbec69e80b [diff] |
Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Upgrade mockito-core to 2.25.1 Change-Id: If3a6b8d8c0648b6386f9c2c81c0f8f9dac415151