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

Commit dc8d4165 authored by Qiwen Zhao's avatar Qiwen Zhao
Browse files

Merge commit 'f6eebb21' into master-nova 

Conflicts:
	core/java/android/view/GLES20Layer.java
	core/jni/android_view_GLES20Canvas.cpp
parents cc69d4c7 f6eebb21
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment