summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/RegionSamplingThread.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2021-08-15 04:36:56 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-15 04:36:56 +0000
commit811c3813e2b2bfc089d6357b1a4fc5e0e2a330b8 (patch)
treef1351e3f577fb6a52a43aa829144eb07700ea0dc /services/surfaceflinger/RegionSamplingThread.cpp
parent197953dbbcffdbe672d32152b3bf9b2ad1f50a98 (diff)
parent05605994afe83d507c3044e9b9a5a06b31f9064d (diff)
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc11 -s ours am: 32ca6e8190 -s ours am: 18ef175505 -s ours am: 05605994af -s ours
am skip reason: Merged-In I2a2d02a0d7e67ee9577857a210cb6157683e5598 with SHA-1 52846cd871 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15550161 Change-Id: Ifc0f2ae535ad39600fdc88624815fa863b1ea593
Diffstat (limited to 'services/surfaceflinger/RegionSamplingThread.cpp')
0 files changed, 0 insertions, 0 deletions