summaryrefslogtreecommitdiff
path: root/libs/ui/DisplayIdentification.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2024-09-07 03:27:36 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-09-07 03:27:36 +0000
commit0984bd2d39ca900af581ff47b4ae018180c2f75e (patch)
treebb43d73f58dfb680e575476023956dcd52e9b293 /libs/ui/DisplayIdentification.cpp
parent3d78a7dcb2a1feb0d40a51b0a21247a1a9d7624e (diff)
parent97a613d897a22f5f37e636acf10739cd52afd8fa (diff)
[automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 9f4086816e -s ours am: 97a613d897 -s ours
am skip reason: Merged-In Ibe9b06e590ed420f29c790188dee11674fca5a2e with SHA-1 68e90f1b4e is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3258441 Change-Id: I46c4b188d1ad81682a42ee845559045b1b7b1920 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/ui/DisplayIdentification.cpp')
0 files changed, 0 insertions, 0 deletions