commit 7784d43aba40ea0002add683c0e52c3e3a9fa968
author The Android Automerger <android-build@android.com> Wed Mar 28 07:03:36 2012 -0700
committer The Android Automerger <android-build@android.com> Wed Mar 28 07:03:36 2012 -0700
tree 9a9c5391dfac78a8e947c6ce4c2c923b37af7dd5
parent b4110dee15342723cc04e24a9c51e2294ee13645
parent e434b8010832dfafe59dabe53c2d05512d04b5d6

merge in jb-release history after reset to master

res/values-in/strings.xml

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e93d4e8..a4795ef 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="8095131950334945205">"Calculator"</string>
-    <string name="error" msgid="9197457880925804499">"Galat"</string>
+    <string name="error" msgid="9197457880925804499">"Kesalahan"</string>
     <string name="digit0" msgid="8069590963464434135">"0"</string>
     <string name="digit1" msgid="8535041374797804029">"1"</string>
     <string name="digit2" msgid="8977354203154316247">"2"</string>