tree cc41aec2c2c023b9d4129e5c40493d876f3a0d30
parent c0bb45f37b4ac3313fcf4e294632402e28332ea0
parent 2cba51a3395e56c8cc28c8a586d3c59cecd5beab
author David Pursehouse <dpursehouse@collab.net> 1560592502 +0900
committer David Pursehouse <dpursehouse@collab.net> 1560592502 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Set version to 2.15.15-SNAPSHOT
  Update buildifier to 0.26

Change-Id: I8036ae88c922f53a00582efc8f6c4b44a9954adf