diff options
| author | Dan Egnor <egnor@google.com> | 2009-11-17 23:05:41 -0800 |
|---|---|---|
| committer | Dan Egnor <egnor@google.com> | 2009-11-17 23:05:41 -0800 |
| commit | 724bfd5af6730bb63c7ee7ff1b5c93878138dc4c (patch) | |
| tree | 6568101fd72f1670b2e0036a590d99fa4717f890 /preloaded-classes | |
| parent | 8468c19049f45784d53c10605c2b7835777d841b (diff) | |
| parent | 5a0db121c84b38b8b9711c3fc7e5f6c0b2fa5815 (diff) | |
| download | frameworks_base-724bfd5af6730bb63c7ee7ff1b5c93878138dc4c.zip frameworks_base-724bfd5af6730bb63c7ee7ff1b5c93878138dc4c.tar.gz frameworks_base-724bfd5af6730bb63c7ee7ff1b5c93878138dc4c.tar.bz2 | |
resolved conflicts for merge of 5a0db121 to master
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/preloaded-classes b/preloaded-classes index a21c90c..907938b 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -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 |