| commit | 895542ff99e8cadcd7c442680aa20edf7ee2bd3c | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Fri Nov 23 17:27:33 2018 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Fri Nov 23 17:27:33 2018 +0900 |
| tree | 0273ef0066a40cad7f40b2e3d8c7b3256b3f0b50 | |
| parent | e338ad063fd1bbe8c913a8771070dd90997e2ded [diff] | |
| parent | f1645de11a063edb2ba887a984d3c510463efd77 [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Update mockito to 2.23.4 Change-Id: I6af5089756b04b517a289339c19bb35fb231b480