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

Skip to content
Commit 90102e2c authored by Jonathan Dixon's avatar Jonathan Dixon
Browse files

resolved conflicts for merge of 1421827b to master 

Simple resolve: two new methods added to same class.

Conflicts:
	core/java/android/webkit/WebViewFactoryProvider.java

Change-Id: Ic8b26f2a51279348b19a9c5b30d492f67d62ca81
parents 887a192e 1421827b
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