tree f5be43093ecb990cdb9a0fb2d51bbf143a0fd84a
parent 763b6626d7e8de51c20dc144b691a049b3c90262
parent 28aa2290c7f7742261d69b358f3de30d2e87c13b
author David Pursehouse <dpursehouse@collab.net> 1497315059 +0900
committer David Pursehouse <dpursehouse@collab.net> 1497315063 +0900

Merge branch 'stable-2.14'

* stable-2.14:
  Upgrade API to 2.14.1

Change-Id: I499ee374585f4fd8d0bd0e409defd6b784592062