commit d0d8bbeb906333a7cbedaf31a641a4b7feed4cdb
author Elliott Hughes <enh@google.com> Mon Feb 22 12:09:51 2010 -0800
committer Elliott Hughes <enh@google.com> Mon Feb 22 12:09:51 2010 -0800
tree 56b3b8508043d183c0895a5e9125d0a8806abf64
parent 0704dba57a4a97d652c221c6754cac81e004f595
parent bbcaf14c62a09ec8fffec3cadcdb47fa33f56fbe

Merge remote branch 'goog/master' into mm

Conflicts:
	libcore/JavaLibrary.mk

Register.c

diff --git a/Register.c b/Register.c
index 7427972..33bee4e 100644
--- a/Register.c
+++ b/Register.c
@@ -99,8 +99,6 @@
         goto bail;
     if (register_com_ibm_icu4jni_util_Resources(env) != 0)
         goto bail;
-    if (register_com_ibm_icu4jni_text_NativeRBNF(env) != 0)
-        goto bail;
 
     if (register_SQLite_Database(env) != 0)
         goto bail;

include/nativehelper/AndroidSystemNatives.h

diff --git a/include/nativehelper/AndroidSystemNatives.h b/include/nativehelper/AndroidSystemNatives.h
index 800c015..28b9c8c 100644
--- a/include/nativehelper/AndroidSystemNatives.h
+++ b/include/nativehelper/AndroidSystemNatives.h
@@ -86,7 +86,6 @@
 int register_com_ibm_icu4jni_text_NativeDecimalFormat(JNIEnv* env);
 int register_com_ibm_icu4jni_regex_NativeRegEx(JNIEnv* env);
 int register_com_ibm_icu4jni_util_Resources(JNIEnv* env);
-int register_com_ibm_icu4jni_text_NativeRBNF(JNIEnv* env);
 
 int register_sun_misc_Unsafe(JNIEnv* env);