tree c888478b2aff60ba915f454a36475b564301b670
parent 67ef02986bbd0187712e2eba402d695308c39ae2
parent a6717fbc85902fe50f370d38f82b562d75c08e9b
author Dmitry Shmidt <dimitrysh@google.com> 1673558035 -0800
committer Dmitry Shmidt <dimitrysh@google.com> 1673558035 -0800

Merge remote-tracking branch 'hikey-aosp/mirror-android12-5.4-lts' into meson-5.4

Change-Id: Ic6eea12c663227d27fc182a48732aa4fe3516c6d