diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-08-05 14:02:36 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-08-05 14:02:36 -0700 |
| commit | 92d249c57ffb8331860494f4ff403c805fdbc0dc (patch) | |
| tree | 15a38fa6c68a53ef6f35d4d6675d7f39f1e57b76 /preloaded-classes | |
| parent | 507a4ea34038daa521036d4c820288b3166a0ed5 (diff) | |
| parent | 1b7e4d5adcc2737bc11bfbf42a88a02d6df984e0 (diff) | |
| download | frameworks_base-92d249c57ffb8331860494f4ff403c805fdbc0dc.zip frameworks_base-92d249c57ffb8331860494f4ff403c805fdbc0dc.tar.gz frameworks_base-92d249c57ffb8331860494f4ff403c805fdbc0dc.tar.bz2 | |
resolved conflicts for merge of 1b7e4d5a to master
Change-Id: Ib3f8e1bffb759dbe5ef5e681ac872e9a9b70c24e
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 6a10bb3..33dba37 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -697,8 +697,6 @@ com.ibm.icu4jni.charset.CharsetEncoderICU com.ibm.icu4jni.charset.CharsetICU com.ibm.icu4jni.charset.NativeConverter com.ibm.icu4jni.common.ErrorCode -com.ibm.icu4jni.lang.UCharacter -com.ibm.icu4jni.regex.NativeRegEx com.ibm.icu4jni.text.Collator com.ibm.icu4jni.text.NativeBreakIterator com.ibm.icu4jni.text.NativeCollation @@ -1168,7 +1166,6 @@ org.apache.harmony.security.x509.SubjectPublicKeyInfo org.apache.harmony.security.x509.TBSCertificate org.apache.harmony.security.x509.Time org.apache.harmony.security.x509.Validity -org.apache.harmony.text.BidiWrapper org.apache.harmony.xml.ExpatAttributes org.apache.harmony.xml.ExpatParser org.apache.harmony.xml.ExpatPullParser |