tree 6df19f459539608a144e48e869a1636dd47104d2
parent 4efe3f468fb2000d8a52644af86d802a277b63ed
parent e8ad7b41d8770217e0655745f5342808cdb6cafa
author David Pursehouse <dpursehouse@collab.net> 1539213351 +0900
committer David Pursehouse <dpursehouse@collab.net> 1539213351 +0900

Merge branch 'stable-2.14'

* stable-2.14:
  Format BUILD file with buildifier
  Fix broken build

Change-Id: I05f399a91dadb2c4d6f764800b579b99e55c6098