tree 6574e566acd589e9213bf00b2cc52d4864c00201
parent 321594c005c40b9044b94d294421a793b45b941b
parent 27a3dddba92d0ec5a2082441bf7dffb8ccea8a54
author David Pursehouse <david.pursehouse@sonymobile.com> 1424394836 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1424394846 +0900

Merge branch 'stable-2.10'

* stable-2.10:
  Consume API version 2.10

Merge made by the 'ours' strategy.

Change-Id: Id8754b611c09063e0afd76911085199e72409f0a