tree 10e1e94109afac6fecd0040d976170b7cbf3c696
parent 7d32038a71925de75be511a32bacbd5bf48b9618
parent e42b76d4ba1bedfadbda3d10cb6515a5fcfa987d
author David Pursehouse <dpursehouse@collab.net> 1542763085 +0900
committer David Pursehouse <dpursehouse@collab.net> 1542763085 +0900

Merge branch 'stable-2.16'

* stable-2.16:
  Use com.google.inject instead of javax.inject

Change-Id: I38fca808946e7f4c91e7a7ba7c1bfef3d2d787d2