tree 6bf4f7ee61117768f0c6fe2ee6115d02327eb56c
parent 4a27229bead75b5bf0de7cf01ef5cdb784bfef9f
parent 4621375fc92aa1075c544940e7892ce8da65a93c
author Rachel Lee <rnlee@google.com> 1724781602 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1724781602 +0000

[automerger skipped] Merge "Make Display.Mode.isSynthetic TestApi" into aosp-main-future am: 4621375fc9 -s ours

am skip reason: Merged-In Ic28956ac65f9642b9a78a31fff0111e28c6a69e0 with SHA-1 62fb8f943b is already in history

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

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