summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/Layer.cpp
diff options
context:
space:
mode:
author Michael Wright <michaelwr@google.com> 2015-06-23 19:04:31 +0100
committer Michael Wright <michaelwr@google.com> 2015-06-23 19:04:31 +0100
commit7d3ad695304a1f24026227e630add6edd76fd0d6 (patch)
treef7a3a8769cc9321a08b4e1a1e4e1fed2732f4bd6 /services/surfaceflinger/Layer.cpp
parentcc62b6c65eb51b62774882c53c53e20c336bc998 (diff)
parent71997c1a921b8d55cff4581fe29743553654912b (diff)
Merge commit '71997c1a' into manualmerge
Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648
Diffstat (limited to 'services/surfaceflinger/Layer.cpp')
0 files changed, 0 insertions, 0 deletions