Merge android-platform-art (10.0.0+r36-5) import into refs/heads/workingbranch
authorJochen Sprickerhof <jspricke@debian.org>
Tue, 5 Apr 2022 11:39:26 +0000 (12:39 +0100)
committerJochen Sprickerhof <jspricke@debian.org>
Tue, 5 Apr 2022 11:39:26 +0000 (12:39 +0100)

Trivial merge