am 61388102: Calendar color picker Exchange account fix
* commit '61388102bec5243dfd4494b8c674cdb7957663a6':
Calendar color picker Exchange account fix
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))
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 86e88af..a0b8e08 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -163,7 +163,7 @@
<string name="yearly_plain" msgid="3652692085322162449">"Anual"</string>
<string name="monthly_on_day" msgid="5370155265278821156">"Mensualmente (el día <xliff:g id="DAY_OF_MONTH">%s</xliff:g>)"</string>
<string name="yearly" msgid="8576208380302949002">"Anualmente (el <xliff:g id="DATES">%s</xliff:g>)"</string>
- <string name="custom" product="tablet" msgid="3806817351377723249">"Personalizado (no se puede personalizar en la tableta)"</string>
+ <string name="custom" product="tablet" msgid="3806817351377723249">"Personalizado (no se puede personalizar en la tablet)"</string>
<string name="custom" product="default" msgid="4137468716966004993">"Personalizado (no se puede personalizar en el teléfono)"</string>
<string name="modify_event" msgid="5982876409997142690">"Cambiar solo este evento"</string>
<string name="modify_all" msgid="4421657265864209041">"Cambiar todos los eventos de esta serie"</string>
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">
