tree 5d5a4ae360e0a202d848fcc4e618ccadf545c0ee
parent e8d37e54614b2444ac6be41e444b472c1ca12c02
parent aa683c3fa87c68c8f0e10254ccbd1dc35bb92791
author Zhi Dou <zhidou@google.com> 1695056860 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1695056860 +0000

Merge "Fix b/300640506" into main am: aa683c3fa8

Original change: https://android-review.googlesource.com/c/platform/development/+/2754745

Change-Id: Ib9d9f9868a2ce033dfd6d0ce1039f4b77b681ab7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>