tree c70df2c8708d447c238b81e435f463b9fd8eb54f
parent b5fcace2b9468229c4ba865f0d7c576bf95c6198
parent 92d4c5d3692e02e474f854b113b227523c8775c1
author David Pursehouse <dpursehouse@collab.net> 1557737487 +0200
committer David Pursehouse <dpursehouse@collab.net> 1557737487 +0200

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Upgrade buildifier to 0.22.0

Change-Id: I6565a03c1571e6cc4a83d98bf8c58ee88b1c68d6