tree eb5f6617915df47479c044c03d9e9af591751b67
parent 01ac28ad027dc0f9a26549a1a6fbb29b484e6f4d
parent 93611796a25e6a95113ace17625474d555fcba8f
author Makoto Onuki <omakoto@google.com> 1729543285 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1729543285 +0000

Merge "Prepare for compat-framework support" into main am: 93611796a2

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

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