diff options
| author | 2024-09-25 19:28:08 +0000 | |
|---|---|---|
| committer | 2024-09-25 19:28:08 +0000 | |
| commit | 94fd1581ec61f385ed2bee3be5c2e947cb749e07 (patch) | |
| tree | 459e2f405b5412773bcbe7baa75bcfce4ebae4ed /libs/gui/DisplayLuts.cpp | |
| parent | 041c15a297c3516cb21e0efd76f2b674f56c5023 (diff) | |
| parent | 2a7388a6e3b27b5f35a5450fbb3bb5b93513d08b (diff) | |
Merge changes from topic "am-7d5e5bd2fc184e2ebbab7c487e278d31" into main am: 2a7388a6e3 -s ours
am skip reason: Merged-In Ic5b2b298fe0df357f77ef8f06b1fc0fc248e0498 with SHA-1 5cf032c4c5 is already in history. Merged-In was found from reverted change.
Reverted change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3275058
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3276053
Change-Id: I7da4458c7c5c56d23d05fa40b34e4faa1dac266d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/gui/DisplayLuts.cpp')
0 files changed, 0 insertions, 0 deletions