diff options
| author | Elliott Hughes <enh@google.com> | 2014-05-09 01:42:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-09 01:42:32 +0000 |
| commit | 3ec84702bddea01677e8f69f9c89548ef8f7237f (patch) | |
| tree | cde0478694974d5cf651b62216986d658f9592fe /luni/src | |
| parent | 463f35058d2e80ace9ad85d3d0aa05fd59567d9d (diff) | |
| parent | 4f1bfee1a72d7842aa5ce565463ab20466368213 (diff) | |
| download | libcore-3ec84702bddea01677e8f69f9c89548ef8f7237f.zip libcore-3ec84702bddea01677e8f69f9c89548ef8f7237f.tar.gz libcore-3ec84702bddea01677e8f69f9c89548ef8f7237f.tar.bz2 | |
am 4f1bfee1: Merge "Add missing \'const\'."
* commit '4f1bfee1a72d7842aa5ce565463ab20466368213':
Add missing 'const'.
Diffstat (limited to 'luni/src')
| -rw-r--r-- | luni/src/main/native/libcore_icu_ICU.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/luni/src/main/native/libcore_icu_ICU.cpp b/luni/src/main/native/libcore_icu_ICU.cpp index f1e0b9d..cc51722 100644 --- a/luni/src/main/native/libcore_icu_ICU.cpp +++ b/luni/src/main/native/libcore_icu_ICU.cpp @@ -525,7 +525,7 @@ static bool getDateTimePatterns(JNIEnv* env, jobject localeData, const char* loc return true; } -static bool getYesterdayTodayAndTomorrow(JNIEnv* env, jobject localeData, Locale& locale, const char* locale_name) { +static bool getYesterdayTodayAndTomorrow(JNIEnv* env, jobject localeData, const Locale& locale, const char* locale_name) { UErrorCode status = U_ZERO_ERROR; ScopedResourceBundle root(ures_open(NULL, locale_name, &status)); ScopedResourceBundle fields(ures_getByKey(root.get(), "fields", NULL, &status)); |