tree 3eb202b01b2718a014394918f744aa4592eefcf8
parent 36f18d93d241b43411e2223f75bc00a817e47554
parent f875eebbc6fdf51d61dcad5820bb0a1a4fbccf62
author David Pursehouse <david.pursehouse@sonymobile.com> 1449033013 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1449033028 +0900

Merge branch 'stable-2.11'

* stable-2.11:
  Build with API version 2.11.5
  Build with API version 2.10.7
  Build with API version 2.9.4

Merge made by the 'ours' strategy to avoid conflicts.

Change-Id: I12a4d3a07d8ba3cbcf0529497b8bd49401071fb8