tree 02d32eca967b740a642022e567502e1856fea480
parent 6582905669d0ccdd009f839936f8209010ae9d6f
parent 8c003fd8211984571e2e53cd037aacd960d67126
author David Pursehouse <david.pursehouse@sonymobile.com> 1424083813 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1424083826 +0900

Merge branch 'stable-2.9' into stable-2.10

* stable-2.9:
  Consume API version 2.9

Merge made by the 'ours' strategy.

Change-Id: Ife4ea0b62d025dd14ef84004d5be36b3900773e1