summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Qiwen Zhao <zhao@google.com> 2015-07-10 01:43:07 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-07-10 01:43:07 +0000
commit3f8fbfdb9bde70454f617ab8f59874bdf132cb29 (patch)
tree8619e78a3b418881386c28c5cd437f35416761ee /libs/gui/ConsumerBase.cpp
parentf37143d8a55afc6481d31de1c6f8e8db9578ef1d (diff)
parent982719b179aecc33aa6c258318fcbf6e4faa81d7 (diff)
am 982719b1: (-s ours) DO NOT MERGE ANYWHERE. reset back to 570052f with history.
* commit '982719b179aecc33aa6c258318fcbf6e4faa81d7':
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions