summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Dan Stoza <stoza@google.com> 2015-04-03 17:07:39 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-04-03 17:07:39 +0000
commit5bbd68d6447c532a76aaa5a5d811a48f55ff18f3 (patch)
tree82c970c39941c2bd234c7990ed7fd32486c86f5b /libs/gui/ConsumerBase.cpp
parentb3fb52f7d80434001534b9680a45d20e93b598dd (diff)
parent6941090eb6eb14d3bd141f72a4af215162094ec0 (diff)
am 6941090e: (-s ours) am 03af2bf6: (-s ours) am 1e954441: (-s ours) Merge "DO NOT MERGE libgui: Plumb attach/detach through Surface"
* commit '6941090eb6eb14d3bd141f72a4af215162094ec0': DO NOT MERGE libgui: Plumb attach/detach through Surface
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions