tree 7303f2f4a2843141d883a7e4c9d304a53964d430
parent 87638e86655ed939d220804e268e5432e5e250be
parent 8e0bb37977452a66141833370430f307e959acfb
author David Pursehouse <dpursehouse@collab.net> 1494376423 +0900
committer David Pursehouse <dpursehouse@collab.net> 1494376427 +0900

Merge branch 'stable-2.14'

* stable-2.14:
  Upgrade to API version 2.14

Change-Id: I47968c47b4edbc2a70cd7e6a9e4cf20a0f713a85