summaryrefslogtreecommitdiff
path: root/libs/gui/QueueBufferInputOutput.cpp
diff options
context:
space:
mode:
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 2019-09-12 00:14:19 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-09-12 00:14:19 +0000
commit7547b412b2dcf19e5e4d64889f57f22d444bdae9 (patch)
tree5ecf4cca14979ded72755fae1d6fa47e729445e9 /libs/gui/QueueBufferInputOutput.cpp
parentb61f01641d2295c76294198c9b6006f550450cff (diff)
parent315c0015b7881bb1808c9dd55c10191132687828 (diff)
Merge "[automerger skipped] Merge "Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master" into stage-aosp-master am: 6a5fab707b -s ours am: 9a2f1dc9ea -s ours am: bbdff6f519 -s ours am skip reason: change_id Ied9a812f235e2a5146381b0ac8c602db1c6035f5 with SHA1 b9a4f9efdd is in history"
Diffstat (limited to 'libs/gui/QueueBufferInputOutput.cpp')
0 files changed, 0 insertions, 0 deletions