commit 9d5a9434d3fe65d32aae0a400502dde8357f0ec7
author Deepanshu Gupta <deepanshu@google.com> Tue Nov 19 00:19:01 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 19 00:19:01 2013 +0000
tree 3c0ae58df88e7b52528973fc9cc78b36f40ca05a
parent 245408d29018fee4b1231e52f5da1edcc3283c4a
parent 0baec410c29206dc72d9f5afba5d45827e62c00c

Merge "Update ICU_Delegate methods. DO NOT MERGE" into klp-dev

tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java

diff --git a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
index 06ae804..ad4103b 100644
--- a/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
+++ b/tools/layoutlib/bridge/src/libcore/icu/ICU_Delegate.java
@@ -46,7 +46,7 @@
     // --- Native methods accessing ICU's database.
 
     @LayoutlibDelegate
-    /*package*/ static String getBestDateTimePattern(String skeleton, String localeName) {
+    /*package*/ static String getBestDateTimePatternNative(String skeleton, String localeName) {
         return DateTimePatternGenerator.getInstance(new ULocale(localeName))
                 .getBestPattern(skeleton);
     }
@@ -167,7 +167,7 @@
     }
 
     @LayoutlibDelegate
-    /*package*/ static boolean initLocaleDataImpl(String locale, LocaleData result) {
+    /*package*/ static boolean initLocaleDataNative(String locale, LocaleData result) {
 
         // Used by Calendar.
         result.firstDayOfWeek = Integer.valueOf(1);