summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceControl.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2019-07-10 22:51:15 -0700
committer android-build-merger <android-build-merger@google.com> 2019-07-10 22:51:15 -0700
commitbe1e09860c0efc9fb59e5e3affb9eb39c145cbd1 (patch)
tree33d7ed85bc01436c25513100cff4c7b5e65387d7 /libs/gui/SurfaceControl.cpp
parent3fd27cdec7ea32f51a5db42b0eb4dddf1f722511 (diff)
parentadd824adfe02d6c2e710d5f94ea5597f165ee1fa (diff)
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190705.004) into master"
am: add824adfe -s ours am skip reason: subject contains skip directive Change-Id: I8906b8d69e8f6ab615287e7059939c1acc0e80b3
Diffstat (limited to 'libs/gui/SurfaceControl.cpp')
0 files changed, 0 insertions, 0 deletions