tree 07078365946acc16786f7817d4593bd4ffd2a077
parent 350875a8191b6c4a086b87100ab7e74a588aac2a
parent 18bc259d57a67cb30d43d030f8d216a9561f5c45
author David Pursehouse <dpursehouse@collab.net> 1475240357 +0900
committer David Pursehouse <dpursehouse@collab.net> 1475240374 +0900

Merge branch 'stable-2.12'

* stable-2.12:
  Build with API version 2.12

Change-Id: Ia5e685a9723dba4460a73972ca0a513f7836f3d6