commit | 385c0dbe20cc3add6fe231eee805ee7b5a199321 | [log] [tgz] |
---|---|---|
author | Marco Miller <marco.miller@ericsson.com> | Wed Feb 20 15:55:42 2019 -0500 |
committer | Marco Miller <marco.miller@ericsson.com> | Wed Feb 20 16:16:10 2019 -0500 |
tree | 44adff2bd119fb1d457d5f72ec71c348a3685a76 | |
parent | b06a82746a4cde4792243bfb95705ccfa35217b5 [diff] | |
parent | eba19fda9a0e216dc412c32e19d69323ec3fcc1e [diff] |
Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Update mockito-core to 2.24.5 Change-Id: Ib73ade5e0f486f0d312995a43a254bf67adaf940