| commit | 9a61668fa10f417822babfa63079754730277ca8 | [log] [tgz] |
|---|---|---|
| author | Marco Miller <marco.miller@ericsson.com> | Thu May 30 14:03:58 2019 -0400 |
| committer | Marco Miller <marco.miller@ericsson.com> | Thu May 30 14:03:58 2019 -0400 |
| tree | 625fdb0695753371bfe01032227087cf38b33c85 | |
| parent | d610622ed401e3b1afbce261454b59934f52ac18 [diff] | |
| parent | 99074021f3699bf6262804822929ac17aaa915a4 [diff] |
Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Upgrade mockito-core to 2.28.2 Don't import Id/Key/NameKey directly Change-Id: Id8aea8aea44a1f1ffbbd0686b932d8e1c8cdc8a5