tree 87ed9af3bd9040aff4704b459ede51cc0a312ac4
parent 5e74446714e7ce804009a035de94694c920a72bd
parent 1f02d31f659082b9081c9ce3cfade37145c7f03b
author David Ostrovsky <david@ostrovsky.org> 1609171846 +0100
committer David Ostrovsky <david@ostrovsky.org> 1609171846 +0100

Merge branch 'stable-3.1' into stable-3.2

* change-292106:
  Adapt tests to compact JSON
  Revert "Clean up BUILD rules"

Change-Id: I9062c5f84c85cdf3203f8c4c7d7a8462f276c98e