summaryrefslogtreecommitdiff
path: root/libs/gui/SurfaceControl.cpp
diff options
context:
space:
mode:
author Dan Willemsen <dwillemsen@google.com> 2019-06-07 14:15:21 -0700
committer android-build-merger <android-build-merger@google.com> 2019-06-07 14:15:21 -0700
commitdf43762b970c03e201870d7dc386dee4cbdcd8d2 (patch)
treea1c89047c55cf5bbac9248276449ad544306d6ab /libs/gui/SurfaceControl.cpp
parent8cdb3bab639d08a31f5dac430467a33f2bb31caf (diff)
parent2330190843961b19f793acffa5f9d237f6994241 (diff)
[automerger skipped] Merge "Match src paths with aidl package name" am: 1f1d0260a0 am: 9dcf3bc9a5 -s ours
am: 2330190843 -s ours am skip reason: change_id I33c684de4c0c52012b496d2f2447eceaba26c191 with SHA1 a5d6522ff0 is in history Change-Id: I87a0c9198482ac0cb401811cc19d881fcc220c89
Diffstat (limited to 'libs/gui/SurfaceControl.cpp')
0 files changed, 0 insertions, 0 deletions