| commit | 018645fa21a08ebd948f92a4f953ed29fa31f2e8 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Mon Nov 26 10:22:44 2018 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Mon Nov 26 10:22:44 2018 +0900 |
| tree | e01bcb9c7652026d6528f664b34ba563bd9567fa | |
| parent | 708df67b17fea52ccc571e0d69313e75c8836501 [diff] | |
| parent | ecd1646699b70fb359077e75206fd9531b6af158 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Update mockito to 2.23.4 Change-Id: I8f383812792df736b8bc0a8c9ad79be892b9bbac