tree 10ad19b947fd93a16133794153186ffc9592d23d
parent c50f3ad799ada8ff3c136fe0b3b21e407c4b48f8
parent c3520e0581f3ceca2c878d33d27df5776caf0143
author David Pursehouse <dpursehouse@collab.net> 1517383138 +0900
committer David Pursehouse <dpursehouse@collab.net> 1517383138 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Update bazlets to latest stable-2.14 to use API version 2.14.6
  Upgrade bazlets to latest stable-2.14 to use API version 2.14.5.1
  Upgrade to latest bazlets on stable-2.14

No-op merge done with `-s ours`.

Change-Id: I9596c9ff077b9bdd82f379c198f5c47f0188616a