commit 6ed50dfa95a9f797ccfeba2dca16bac0ba1a4948
author The Android Automerger <android-build@google.com> Sun Oct 06 06:02:08 2013 -0700
committer The Android Automerger <android-build@google.com> Sun Oct 06 06:02:08 2013 -0700
tree 960222b6a678f1c7bdc1e8a79dd4337c65f49ffc
parent a01e5a4d80c4f8121686c995735ffa3605ef87df
parent fc6ff3c16417ad94cf7505899ea25494b52c4156

merge in klp-release history after reset to klp-dev

res/values-am/strings.xml

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index a84b5dc..49cf707 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -23,7 +23,7 @@
     <string name="service_name" msgid="6860303747999592491">"የአገልግሎት ስም"</string>
     <string name="stk_no_service" msgid="5427773116839809131">"ምንም አገልግሎት የለም"</string>
     <string name="button_ok" msgid="5760722312558549555">"እሺ"</string>
-    <string name="button_cancel" msgid="1997847915560800261">"ይቅር"</string>
+    <string name="button_cancel" msgid="1997847915560800261">"ሰርዝ"</string>
     <string name="button_yes" msgid="624420260648337203">"አዎ"</string>
     <string name="button_no" msgid="1824959157582605627">"አይ"</string>
     <string name="alphabet" msgid="1583185545938805861">"ፊደሎች"</string>