OSDN Git Service

resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Tue, 9 Sep 2014 05:15:20 +0000 (22:15 -0700)
committerDan Albert <danalbert@google.com>
Tue, 9 Sep 2014 05:15:20 +0000 (22:15 -0700)
commit5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c
tree668ba5aff67786080794908d01ae27f2305d13bd
parent0b12929fddd9a4b3c9a857ea360213ffd6e60ef2
parent86aeb9ef154d7aa63c58cbe5be62e5b61d6ae5fa
resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp

Change-Id: I82fe2b385156d9bdb9e7183e308d7b2a4167b6ce
libs/gui/BufferItemConsumer.cpp
libs/gui/ConsumerBase.cpp
libs/gui/CpuConsumer.cpp
libs/gui/GLConsumer.cpp