tree 5f31cf891af86f03a8e93d2d5a0469c02bec859c
parent 1ca920f0aee16936b9acc23441696123afef75bc
parent 667dd78368a1785a365ac25d2f3111f75e0a6e71
author David Pursehouse <david.pursehouse@sonymobile.com> 1453772267 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1453772273 +0900

Merge branch 'stable-2.12'

* stable-2.12:
  Build with API version 2.12

Change-Id: Ia60b0ed07728edc6bb99974e5c4cd9bb0f9ed844