| commit | a6ffb2f466fd3cd8a13f8f7f09fa27e519296d4d | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Fri Nov 23 17:28:03 2018 +0900 |
| committer | David Pursehouse <dpursehouse@collab.net> | Fri Nov 23 17:28:03 2018 +0900 |
| tree | 6718685a0a2f8dc9cb0eee827e0cb01a5c1cf746 | |
| parent | 9f4aa3967939b13ef7e201c30088808f195c0c3c [diff] | |
| parent | 895542ff99e8cadcd7c442680aa20edf7ee2bd3c [diff] |
Merge branch 'stable-2.15' * stable-2.15: Update mockito to 2.23.4 Change-Id: Ia1e2970cf5e301256617f3496f5f3c1b1a569fdb