summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Siarhei Vishniakou <svv@google.com> 2017-08-14 00:55:39 +0000
committer android-build-merger <android-build-merger@google.com> 2017-08-14 00:55:39 +0000
commitc049ad5ccf4aa44cc03564c6308f344969ea125a (patch)
tree60132f830a0fbbfbbd0de9516384001986e8fc3f /libs/gui/ConsumerBase.cpp
parentbc4beed48c922f086dfdc241c933bbcf03395239 (diff)
parente5e1d4f4b0d1427f2359f9bd455430924872565d (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: 34ec404b4b" into oc-dr1-dev-plus-aosp am: 47d2f1aa90
am: e5e1d4f4b0 -s ours Change-Id: Ife99c742af6dbf859c48e0b15af87b5b7cc5001b
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions