tree b5d843bc998f12b13f0bf845d4e7f5ec57d7e36a
parent efd24e64cbfefac5133f59623ec3dad21f2b79a1
parent 96404e0749864c9fbf8b12e1d424e8078809e00a
author Jonas Finnemann Jensen <jonasfj@google.com> 1636469840 +0100
committer Jonas Finnemann Jensen <jonasfj@google.com> 1636469840 +0100

Merge branch 'cherry-pick-for-2.15.0'

Ensures that commit won't disappear from git in the future.