GitLab

Conflicts:
	libs/gui/Surface.cpp

Change-Id: I183aad080a8a822191aaaddcd4ba3e3bc1d4410b
Signed-off-by: Zikim,Wei <wzq@rock-chips.com>