summaryrefslogtreecommitdiff
path: root/libs/gui/ConsumerBase.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-16 19:01:08 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-01-16 19:01:08 +0000
commit0dbbf7492c2816376129c8751f7e1ddd7c3bdf7f (patch)
tree2ab25d3ad69d3ef5a50b20159dee83faa4a77433 /libs/gui/ConsumerBase.cpp
parentbebac74f5d31832e3d90017a53568dfcc34c9ba2 (diff)
parentb97c72e2d5d5651883e8f5b46bdb8a28c7a991fb (diff)
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 4d1ce2a77e am: b97c72e2d5 -s ours
am skip reason: subject contains skip directive Change-Id: I8d627f0acb967563187b8f7e34c4d3dcedeffa81
Diffstat (limited to 'libs/gui/ConsumerBase.cpp')
0 files changed, 0 insertions, 0 deletions