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

Commit b7db580e authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of cd6e3484 to master

parents 30cee478 cd6e3484

preloaded-classes

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ android.net.NetworkConnectivityListener$State 
android.net.NetworkInfo

android.net.NetworkInfo$DetailedState

android.net.SSLCertificateSocketFactory

android.net.TrafficStats

android.net.Uri

android.net.Uri$1

android.net.Uri$AbstractHierarchicalUri