summaryrefslogtreecommitdiff
path: root/libs/gui/BufferQueueProducer.cpp
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2017-01-12 08:35:35 -0800
committer Mark Salyzyn <salyzyn@google.com> 2017-01-12 08:36:11 -0800
commite0ea99cc4ba89452b9b6b1baa33bddcb11f3351a (patch)
tree1c90d7dda6cbd815a854cd35432d43064d2e1daa /libs/gui/BufferQueueProducer.cpp
parentba4d92cc90b5d2a902e898211f04311a0ae2493b (diff)
parenta2c2d11f98b692401be56c8f285c570bae47ddda (diff)
resolve merge conflicts of a2c2d11f9 to master
Test: compile Bug: 26552300 Bug: 31289077 Change-Id: I84d0ffa430df3beca0dcc6ed205ce220d7be1f87
Diffstat (limited to 'libs/gui/BufferQueueProducer.cpp')
0 files changed, 0 insertions, 0 deletions