tree b9b562e27cecf903428bccbfe4c325e8f591dfd1
parent c8c356e64712944624f099693b2f65f630ab900a
parent d555fb8e490068f04268f391438c7e7ac7f2ae48
author David Pursehouse <dpursehouse@collab.net> 1542068520 -0800
committer David Pursehouse <dpursehouse@collab.net> 1542068520 -0800

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  FileBasedWebSessionCacheTest: Fix IncompatibleArgumentType error
  Upgrade bazlets to latest stable-2.14 to build with 2.14.17 API

Change-Id: I92e226be81a462d3793ae996faf86acfa5d8d89e