tree 07651c1bbf46a66f9ec7b786c85c8c2c831c0a48
parent c8bba38dd9cbeb3ca47eefa1a2c1e8c0fa48c6da
parent ee45745fc47e960ea90d51bae4a1d409ceec98fb
author David Pursehouse <david.pursehouse@sonymobile.com> 1424163475 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1424163485 +0900

Merge branch 'stable-2.10'

* stable-2.10:
  Consume API version 2.9
  Suppress unused method warnings
  Consume API version 2.10
  fix typo, 'action.config' should be 'actions.config'
  Make work with Gerrit core stable-2.10 branch.

Merge made by the 'ours' strategy.

Change-Id: I0f0b1464d394dbc43c7c49287d2de50d7671ddad