summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/RegionSamplingThread.cpp
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2020-08-26 00:34:35 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-08-26 00:34:35 +0000
commitd6c9aedab039811526b0f0467f78f75fbbb35315 (patch)
treeab8b99f77a5dcafa4312f6d6e026274ba7d699e3 /services/surfaceflinger/RegionSamplingThread.cpp
parent9b96ce2f0067629e878fd4eeb995cdb520e200ab (diff)
parent4a86e516299d9911724541b4ae8a7879cc6d92ba (diff)
[automerger skipped] Merge "Merge stage branch to development trunk." am: 70e1b90b0d -s ours am: 4a86e51629 -s ours
am skip reason: Change-Id Ic44b98572611891b4e28c086035bab2d0f2565d7 with SHA-1 df76f61152 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1409197 Change-Id: I6988a973fbe4b1f2249c46d02c2b46947d8d239e
Diffstat (limited to 'services/surfaceflinger/RegionSamplingThread.cpp')
0 files changed, 0 insertions, 0 deletions