tree c7e0afa0f096178fff0930231afacac862c8662c
parent 16886883b2a318dd5e736838e7e786ed143772e9
parent 5a659c1c9c3697b692fd4290dd6b4effea532ec3
author David Pursehouse <dpursehouse@collab.net> 1543209887 +0900
committer David Pursehouse <dpursehouse@collab.net> 1543209887 +0900

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Bazel: Consider setting timeout="short" or size="small"

Change-Id: Id6bdd7a008663c6a8c02227bfc70de0f8921a83d