commit | 7d5e25215854ef01d79a5e337e1d7fb7e4be58fe | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Wed Feb 20 13:16:20 2019 +0900 |
committer | David Pursehouse <dpursehouse@collab.net> | Wed Feb 20 13:16:20 2019 +0900 |
tree | 853e55cd089188cc8cb5eccff529a201442c7b1b | |
parent | 755cb36e11513c6a1f55511310463fe842eb0930 [diff] | |
parent | 0a4d49602911578e540c666bd1c36e7ac13b4df4 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Update mockito-core to 2.24.5 Change-Id: I379fd83e060917dfb354053cd7f9e2ca774fe14c