| commit | 61382628c31656494725f3aed4e4dc326bea0b6b | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Mon Nov 26 10:23:35 2018 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Mon Nov 26 10:23:35 2018 +0900 |
| tree | e714c0d501a7befd95a104b704cefd096ae5987a | |
| parent | 4aa7dd9f6bdb9c5d0cf5e4fa6b376581f93052b3 [diff] | |
| parent | 018645fa21a08ebd948f92a4f953ed29fa31f2e8 [diff] |
Merge branch 'stable-2.15' * stable-2.15: Update mockito to 2.23.4 Change-Id: I84bd18bccf0ac09aaf41137c357c8f3b45aaea1c