tree b4569064c8ecadec7ec68056178fe507994e106f
parent 8386b3fbf80e375f0a10c8386c0a8dfe260c5c1b
parent ea1dd37eca4b3b46d337f47458d3f3599f957e2e
author David Pursehouse <dpursehouse@collab.net> 1554500957 +0900
committer David Pursehouse <dpursehouse@collab.net> 1554500957 +0900

Merge branch 'stable-2.14' into stable-2.15

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

Change-Id: I75cc4127a8993d867ccd498a555a25a17591daf7