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

Skip to content
Commit add0200d authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge remote-tracking branch 'github/kali' into ics 

Conflicts:
	libs/gui/SurfaceTextureClient.cpp
	services/surfaceflinger/Layer.cpp
	services/surfaceflinger/SurfaceTextureLayer.cpp

Change-Id: Ib353e7d86411c0a3ceb5ecdb75c40a7b7842da15
parents f7ca5108 1f8f4482
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment