| commit | 3689952d87af4e4469dd1e734ccd0176e787f4be | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Sun Nov 25 19:17:01 2018 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Sun Nov 25 19:17:01 2018 +0900 |
| tree | cbe230ea599961b92f610d8c71c2117c94bc05a6 | |
| parent | 15d4f9c3427448e42f9e58613e9e85b1f9e16fda [diff] | |
| parent | bd50b160328ebb863a91ce060195a7247a44d368 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Update mockito to 2.23.4 Change-Id: I407cec0ffd1d978fd4f3a19b9d0f57b3d3007197