commit | cc659507e781f2b1a92b7686a4ef0c89d9f25273 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Tue Apr 09 13:35:07 2019 +0900 |
committer | David Pursehouse <dpursehouse@collab.net> | Tue Apr 09 13:35:07 2019 +0900 |
tree | f744495334b236c55bd59a1969eea5868d59fbca | |
parent | 167b7fadca0d71c220168201de073aeaf4b4d716 [diff] | |
parent | 39d05f6d0592d626f13148933fc2432b7704701d [diff] |
Merge branch 'stable-2.15' into stable-2.16 * stable-2.15: Upgrade mockito-core to 2.26.0 Change-Id: I149c6a26837dfa9bf8b2d895cba8564be1121d7a