commit | d7a311fa59653aaab6256c0bbb4303b916ccc4d5 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Sun Nov 25 19:20:43 2018 +0900 |
committer | David Pursehouse <dpursehouse@collab.net> | Sun Nov 25 19:21:44 2018 +0900 |
tree | 82da50199969275889addfc3f5b58796fe86dac1 | |
parent | 299cc0a4c6f96065a5c0a703a16e278b9e81d798 [diff] | |
parent | e04ef1e84a7da9adf631cb1c0cf69382212f5f6c [diff] |
Merge branch 'stable-2.14' into stable-2.15 * stable-2.14: Update mockito to 2.23.4 Change-Id: Ic95e8ba03b5463ea6206fad44a7c00cdc071a2aa