tree 073119300fc53e39ae0baabcf9cd26ba2c9c5e6d
parent dd9d9be2d128e0dd78da1feb828169f55fbd4d6a
parent a1d77a20a2e9a0cbcbd677018f4cc6d6f23dda95
author David Pursehouse <dpursehouse@collab.net> 1560388499 +0900
committer David Pursehouse <dpursehouse@collab.net> 1560388499 +0900

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Set version to 2.15.14

Change-Id: Id621b1bbf0bab234ab56428df6bccb20df5d23ba