tree 85abfc97a1040d0879f42e7bb5899df0f70583bc
parent c827ba79413585ab9dfc1bbd0d7f609eedd6aa80
parent 33c5536a16d33495919968a9534c202aea8297c4
author David Pursehouse <dpursehouse@collab.net> 1554500986 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554500986 +0900

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Fix undefined variable in pkg_war.bzl

Change-Id: I1a6a118f2d04c4ce198c375c54cec2aaf871dd97