tree 0d29fb65dcf0851064874e738f7163a3910c313a
parent d7e2585ad70b60004151b8525239856b3006b45a
parent 8b616541ad53ad042a493db4c557001b50001367
author David Pursehouse <dpursehouse@collab.net> 1550709564 +0900
committer David Pursehouse <dpursehouse@collab.net> 1550709564 +0900

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.24.5
  Upgrade guice to 4.2.1

Change-Id: I7fe0ca418d94efacfc39b3f7ec61be004d820b8f