summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Android Build Merger (Role) <android-build-merger@google.com> 2017-08-14 00:40:44 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2017-08-14 00:40:44 +0000
commit2af3109b6f6ec4adb4d2a5814a7834c739d384a6 (patch)
tree9eee0e408cb502c1032282585dabcfcc72dff228 /libs/gui/ConsumerBase.cpp
parent378f746984e8f6c9f722c65581807a0b69a93cf7 (diff)
parent2082cef598c11806daf394071f10cebcdfe95ba0 (diff)
Merge "[automerger] DO NOT MERGE Remove window obscurement information. am: edac95e737 am: dda3bdf8a8 am: 3cd049ca28 skipped: 2564b9fdf5 am: 67c9dace8b am: 09c59e7f69 am: a31fb53edd am: b63caaf102 skipped: c2116af15c am: dfe44a12ab am: 3edaa5d134" into oc-dr1-dev-plus-aosp
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions