| commit | 68fcb6a4b176fdc6d329aab5886423e582546d72 | [log] [tgz] |
|---|---|---|
| author | David Pursehouse <dpursehouse@collab.net> | Tue Mar 19 17:09:42 2019 +0000 |
| committer | David Pursehouse <dpursehouse@collab.net> | Tue Mar 19 17:09:42 2019 +0000 |
| tree | 247ea254fbb6fed59d00dfdbf186d8319a87ec7e | |
| parent | ba394d7433bd4114edb943b900031c4627571c44 [diff] | |
| parent | de4ea73673ba67cd58d55ae1110b11f019b8ee11 [diff] |
Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Upgrade mockito-core to 2.25.1 Change-Id: Iae02c65b03e826381e4a85e381fca66b403d8487