commit | 35b1d17823444e43924a059ff846e1372bde7932 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Tue Mar 19 17:09:41 2019 +0000 |
committer | David Pursehouse <dpursehouse@collab.net> | Tue Mar 19 17:09:41 2019 +0000 |
tree | 7931225d150f9d7d93d220b41de3de336dfa120d | |
parent | 35b98a73cda596c1258fffd2990503fd915b6fe1 [diff] | |
parent | 5b3541bb43570529bbe6b2e9f0e9dd743994bd26 [diff] |
Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Upgrade mockito-core to 2.25.1 Change-Id: I66e03f9c43a8d873bbacc7e6c2af8d05e112d6b4