summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-08-27 11:52:27 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-27 11:52:27 -0700
commit445ab76c49779998543bb78881f5d9f8ae81e598 (patch)
tree25bb06c966397bc5643cbfd84d920da70e134409
parente69b286005b0b543e274f523d894e069811215a6 (diff)
parent0db187a3e62074af6a22802bded52a921f69e7df (diff)
downloadframeworks_base-445ab76c49779998543bb78881f5d9f8ae81e598.zip
frameworks_base-445ab76c49779998543bb78881f5d9f8ae81e598.tar.gz
frameworks_base-445ab76c49779998543bb78881f5d9f8ae81e598.tar.bz2
Merge "Broken build. Missing ;" into gingerbread
-rw-r--r--core/jni/android_util_AssetManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp
index 6d80cc4..f3b9357 100644
--- a/core/jni/android_util_AssetManager.cpp
+++ b/core/jni/android_util_AssetManager.cpp
@@ -514,7 +514,7 @@ static jobjectArray android_content_AssetManager_getLocales(JNIEnv* env, jobject
}
for (int i=0; i<N; i++) {
- jstring str = env->NewStringUTF(locales[i].string())
+ jstring str = env->NewStringUTF(locales[i].string());
if (str == NULL) {
return NULL;
}