tree 625fdb0695753371bfe01032227087cf38b33c85
parent d610622ed401e3b1afbce261454b59934f52ac18
parent 99074021f3699bf6262804822929ac17aaa915a4
author Marco Miller <marco.miller@ericsson.com> 1559239438 -0400
committer Marco Miller <marco.miller@ericsson.com> 1559239438 -0400

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