tree c1c0580b7ddd4cac63f7834f5a8f6ac7bfb5da62
parent e89351c3691756a01c9aa33cf7e3a3ef65d8378e
parent b60a6377b137ea5733bb8a9f6e1de05701ec4224
author David Pursehouse <dpursehouse@collab.net> 1541126279 +0900
committer David Pursehouse <dpursehouse@collab.net> 1541126279 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Add "Empty file" comments in empty BUILD files
  ConfigurationParser: Format with google-java-format

Change-Id: I1bac29b1b21b6dda7a23639170256144d03306f2