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

Commit d79e5b08 authored by Steve Kondik's avatar Steve Kondik
Browse files

Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into froyo 

Conflicts:
	core/java/android/net/SSLCertificateSocketFactory.java
	docs/html/resources/dashboard/platform-versions.jd
	docs/html/resources/dashboard/screens.jd
parents 87e13553 e8605af5
Expand all 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