tree d0b2862ab46a59a35e5f2eebffdea372fc1f0cbc
parent 29312755f730baf48427939ebf38fe714efcbd23
parent c27e04abdef994687c459eb8660e8fdf81bc3ee2
author David Pursehouse <dpursehouse@collab.net> 1542600105 +0900
committer David Pursehouse <dpursehouse@collab.net> 1542600105 +0900

Merge branch 'stable-2.16'

* stable-2.16:
  Fix guice creation exception caused by incorrect injection of AccountState

Change-Id: Ia662b97d9a6698eeba70978609c304816f6ec097