Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5273a978 authored by Dan Albert's avatar Dan Albert
Browse files

resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp 

Change-Id: I82fe2b385156d9bdb9e7183e308d7b2a4167b6ce
parents 0b12929f 86aeb9ef

libs/gui/BufferItemConsumer.cpp

+5 −5

File changed.

Contains only whitespace changes.

libs/gui/ConsumerBase.cpp

+5 −5

File changed.

Contains only whitespace changes.

libs/gui/CpuConsumer.cpp

+5 −5

File changed.

Contains only whitespace changes.

libs/gui/GLConsumer.cpp

+5 −5

File changed.

Contains only whitespace changes.