summaryrefslogtreecommitdiff
path: root/libs/gui/LayerState.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-17 00:55:38 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-17 00:55:38 +0000
commitfa183dc681cf06d3543028b5e336dbbfc83d24b6 (patch)
tree0b356223e7bafe20b43792cbd778031d65202300 /libs/gui/LayerState.cpp
parentfe81cf93a0b514166b8f58831b53267bc8838b63 (diff)
parent5986c142d5bd12d02fa4b6149b13931a97aefbaa (diff)
[automerger skipped] Merge changes from topic "am-96e5992b2dd4470eae48f4ad98b53c99" into stage-aosp-master am: 3144b50387 -s ours am: 5986c142d5 -s ours
am skip reason: Merged-In Ia3eae81cc26b28b0d25dc5f5c6cd04ec8c1bafdf with SHA-1 df2fb613db is already in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2186779 Change-Id: Ib6cd93b6a851556b8dd5f1d0c4412cd3d70c4b66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/gui/LayerState.cpp')
0 files changed, 0 insertions, 0 deletions