tree 4b46276df211d5efed70da7855e7d92fcc865a37
parent 980c51f3a2bfd937f881bb0e9358514adaee4e83
parent 5a1fd021254924a869ae037cd5ef44469651ad23
author David Pursehouse <dpursehouse@collab.net> 1517370546 +0900
committer David Pursehouse <dpursehouse@collab.net> 1517370546 +0900

Merge branch 'stable-2.15'

* stable-2.15:
  Update to latest bazlets on stable-2.15
  Update bazlets to latest revision on stable-2.14
  Upgrade to latest bazlets on stable-2.14
  Use latest bazlets

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

Change-Id: I1f35abdb38cf4ded0cc3e474f74f77a180f33ec3