diff options
| author | Dan Egnor <egnor@google.com> | 2009-11-16 17:49:51 -0800 |
|---|---|---|
| committer | Dan Egnor <egnor@google.com> | 2009-11-16 17:49:51 -0800 |
| commit | db0be296d1e759eb063f04b82500faa2c5d74138 (patch) | |
| tree | 26bdf28bde531387ddfc11a029ad3a14ed7ef41c /preloaded-classes | |
| parent | 351367ca1a237df961acacccdbbf0a1a3ed288ad (diff) | |
| parent | 8ad23618a2ff0801f6e518a4415a5dc3040dd29a (diff) | |
| download | frameworks_base-db0be296d1e759eb063f04b82500faa2c5d74138.zip frameworks_base-db0be296d1e759eb063f04b82500faa2c5d74138.tar.gz frameworks_base-db0be296d1e759eb063f04b82500faa2c5d74138.tar.bz2 | |
resolved conflicts for merge of 8ad23618 to master
Diffstat (limited to 'preloaded-classes')
| -rw-r--r-- | preloaded-classes | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/preloaded-classes b/preloaded-classes index 83a2b26..a21c90c 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -712,8 +712,6 @@ com.google.android.net.UrlRules com.google.android.net.UrlRules$Rule com.google.android.util.SimplePullParser com.google.common.Config -com.google.common.io.protocol.ProtoBuf -com.google.common.io.protocol.ProtoBufType com.google.common.util.text.TextUtil com.ibm.icu4jni.charset.CharsetDecoderICU com.ibm.icu4jni.charset.CharsetEncoderICU |