Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 5a0db121 to master

Browse Source
This commit is contained in:
Dan Egnor
2009-11-17 23:05:41 -08:00
parent 8468c19049 5a0db121c8
commit 724bfd5af6
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Android.mk
View File

@@ -534,7 +534,6 @@ LOCAL_SRC_FILES := $(ext_src_files)
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVA_LIBRARIES := core
LOCAL_STATIC_JAVA_LIBRARIES := libgoogleclient
LOCAL_MODULE := ext

3
preloaded-classes
View File

@@ -710,9 +710,6 @@ com.google.android.mms.pdu.PduPersister
com.google.android.net.GoogleHttpClient
com.google.android.net.UrlRules
com.google.android.net.UrlRules$Rule
com.google.android.util.SimplePullParser
com.google.common.Config
com.google.common.util.text.TextUtil
com.ibm.icu4jni.charset.CharsetDecoderICU
com.ibm.icu4jni.charset.CharsetEncoderICU
com.ibm.icu4jni.charset.CharsetICU