| commit | a69dfb5fafe5fe4fb449dce3a48df6184e59c989 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Sun Nov 25 19:18:29 2018 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Sun Nov 25 19:18:29 2018 +0900 |
| tree | 530d8708120a945be4c93a3db712e54ef17ec742 | |
| parent | 6d401c987b75ce181d6c63cd0a4ca42d344371f9 [diff] | |
| parent | 1e2b8629b198b98540de1f80d32186fe570e8aaa [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Update mockito to 2.23.4 Change-Id: Ic7f1300805afba45d80432ef250a1065df5e1288