tree 5e5219f1e8320ec5e9718e57922a6102d2b13848
parent df8f4004ac3cd25acf92199d40ee280b86ad4742
parent 4eade6bb6b47331ba3803b2a69f4c785e286afb6
author David Pursehouse <dpursehouse@collab.net> 1540015229 +0900
committer David Pursehouse <dpursehouse@collab.net> 1540015229 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  WORKSPACE: Make header line space indent consistent
  WORKSPACE: Replace custom local_path with template

Change-Id: Ieb6ffe20d830f0dd54bf05b968a9f0a389d8af0a