commit 42245b3cdcae4229729c41fee94a5381afbe530b
author Isaac Katzenelson <isaackatz@google.com> Thu May 23 17:09:12 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 23 17:09:12 2013 -0700
tree 8b981db1af120a88b192b82676763088deb87c67
parent baf3da97fcfc24675eb6a0133986fd469b316ae9
parent bf9282ec18169524b011c29d0e79ab78a78e62b3

am bf9282ec: Add a dummy file to assets

* commit 'bf9282ec18169524b011c29d0e79ab78a78e62b3':
  Add a dummy file to assets

Android.mk

diff --git a/Android.mk b/Android.mk
index 2393a88..4a8b158 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,7 @@
         android-support-v4 \
         calendar-common
 
-LOCAL_SDK_VERSION := 17
+LOCAL_SDK_VERSION := current
 
 LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
 

res/values-zh-rCN/strings.xml

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 15cfe19..c7ddbca 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -143,7 +143,7 @@
     <string name="discard_label" msgid="2394623883289782541">"取消"</string>
     <string name="snooze_all_label" msgid="4994488813124409077">"全部延迟"</string>
     <string name="dismiss_all_label" msgid="1834400025868091301">"全部关闭"</string>
-    <string name="snooze_label" msgid="1515893621063224666">"暂停提醒"</string>
+    <string name="snooze_label" msgid="1515893621063224666">"稍后再提醒"</string>
     <string name="does_not_repeat" msgid="1877681921029738999">"一次性活动"</string>
     <string name="endByDate" msgid="7654221304929538201">"；直到<xliff:g id="DATE">%s</xliff:g>"</string>
   <plurals name="endByCount">