tree 1101016b1dc33dbdd03f78a41993d17d23f3ba39
parent 51a46eb4b3e84ef20ac83c7f3e96ae1b177213b9
parent c199939a74b838bb6e00f713055307d0f395a731
author Yan Yan <evitayan@google.com> 1732303980 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1732303980 +0000

Merge "Fix build error" into main am: ef5fb8e98c am: c199939a74

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3370508

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