diff options
| author | Brian Carlstrom <bdc@google.com> | 2010-05-27 23:11:20 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2010-05-27 23:11:20 -0700 |
| commit | f77cf7f0f0ea2533d1aef2d098b74d7870bca69e (patch) | |
| tree | d622e4674c0d751096bc1dca8f298758839bec40 /preloaded-classes | |
| parent | a15dcfaf2bc7cbd13b30db6766afe3bbaa01db97 (diff) | |
| download | frameworks_base-f77cf7f0f0ea2533d1aef2d098b74d7870bca69e.zip frameworks_base-f77cf7f0f0ea2533d1aef2d098b74d7870bca69e.tar.gz frameworks_base-f77cf7f0f0ea2533d1aef2d098b74d7870bca69e.tar.bz2 | |
Merge remote branch 'goog/dalvik-dev' into dalvik-dev-to-master
Note that the api/9.xml change is removing APIs that were removed going from RI 5 to RI 6
Change-Id: I665a30c4fdc2ca73c3ade0ad7487aa85cebf272f
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/preloaded-classes b/preloaded-classes index f300fe7..931ea1e 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -693,7 +693,6 @@ com.google.android.gles_jni.GLImpl com.ibm.icu4jni.charset.CharsetDecoderICU com.ibm.icu4jni.charset.CharsetEncoderICU com.ibm.icu4jni.charset.CharsetICU -com.ibm.icu4jni.charset.CharsetProviderICU com.ibm.icu4jni.charset.NativeConverter com.ibm.icu4jni.common.ErrorCode com.ibm.icu4jni.lang.UCharacter @@ -703,9 +702,6 @@ com.ibm.icu4jni.text.NativeBreakIterator com.ibm.icu4jni.text.NativeCollation com.ibm.icu4jni.text.NativeDecimalFormat com.ibm.icu4jni.text.RuleBasedCollator -com.ibm.icu4jni.text.RuleBasedNumberFormat -com.ibm.icu4jni.util.Resources -com.ibm.icu4jni.util.Resources$DefaultTimeZones dalvik.system.DalvikLogHandler dalvik.system.DalvikLogging dalvik.system.NativeStart @@ -754,7 +750,6 @@ java.io.PrintStream java.io.PrintWriter java.io.PushbackReader java.io.RandomAccessFile -java.io.RandomAccessFile$RepositionLock java.io.Reader java.io.Serializable java.io.StreamCorruptedException @@ -926,7 +921,6 @@ java.security.Security java.security.cert.X509Certificate java.text.AttributedCharacterIterator$Attribute java.text.Collator -java.text.Collator$1 java.text.DateFormat java.text.DateFormat$Field java.text.DecimalFormat |