am 80d74893: am ea49c1c8: Merge "Prevent the creation of Shorcuts with null intents (issue 5629292)" into ics-mr1

* commit '80d748932ac2e6774f3e574bb4b9228b849cf6d5':
  Prevent the creation of Shorcuts with null intents (issue 5629292)
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 742788b..1b48b8b 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -63,7 +63,7 @@
     <string name="menu_manage_apps" msgid="2308685199463588895">"Administrer apps"</string>
     <string name="menu_wallpaper" msgid="5837429080911269832">"Tapet"</string>
     <string name="menu_search" msgid="4826514464423239041">"Søg"</string>
-    <string name="menu_notifications" msgid="6424587053194766192">"Underretninger"</string>
+    <string name="menu_notifications" msgid="6424587053194766192">"Meddelelser"</string>
     <string name="menu_settings" msgid="3946232973327980394">"Systemindstillinger"</string>
     <string name="menu_help" msgid="4901160661634590633">"Hjælp"</string>
     <string name="cab_menu_delete_app" msgid="4089398025537640349">"Afinstaller appen"</string>
diff --git a/res/values-sw-sw600dp/strings.xml b/res/values-sw-sw600dp/strings.xml
index 20b6c86..d65f8de 100644
--- a/res/values-sw-sw600dp/strings.xml
+++ b/res/values-sw-sw600dp/strings.xml
@@ -19,7 +19,7 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="wallpaper_dialog_title" msgid="6395005465873616423">"Chagua mandhari"</string>
-    <string name="wallpaper_chooser_empty" msgid="5909737215399452696">"Hakuna mandhari zinazopatikana"</string>
+    <string name="wallpaper_dialog_title" msgid="6395005465873616423">"Chagua pazia"</string>
+    <string name="wallpaper_chooser_empty" msgid="5909737215399452696">"Hakuna pazia zinazopatikana"</string>
     <string name="wallpaper_cancel" msgid="1110492200533814461">"Ghairi"</string>
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index df786fb..053ce2e 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -23,8 +23,8 @@
     <string name="uid_name" msgid="3371120195364560632">"Programu Kuu za Android"</string>
     <string name="folder_name" msgid="8551881338202938211"></string>
     <string name="chooser_wallpaper" msgid="6063168087625352235">"Chagua mandhari kutoka"</string>
-    <string name="wallpaper_instructions" msgid="4215640646180727542">"Weka mandhari"</string>
-    <string name="pick_wallpaper" msgid="5630222540525626723">"Mandhari"</string>
+    <string name="wallpaper_instructions" msgid="4215640646180727542">"Weka pazia"</string>
+    <string name="pick_wallpaper" msgid="5630222540525626723">"Taswira"</string>
     <string name="activity_not_found" msgid="217823393239365967">"Programu haijasakinishwa."</string>
     <string name="widgets_tab_label" msgid="9145860100000983599">"Wijeti"</string>
     <string name="long_press_widget_to_add" msgid="7395697462851217506">"Gusa &amp; ushikilie ili kuteua wijeti."</string>
@@ -39,7 +39,7 @@
     <string name="group_applications" msgid="2103752818818161976">"Prog"</string>
     <string name="group_shortcuts" msgid="9133529424900391877">"Njia za mkato"</string>
     <string name="group_widgets" msgid="6704978494073105844">"Wijeti"</string>
-    <string name="group_wallpapers" msgid="1568191644272224858">"Mandhari"</string>
+    <string name="group_wallpapers" msgid="1568191644272224858">"Pazia"</string>
     <string name="out_of_space" msgid="8365249326091984698">"Hakuna nafasi katika skrini hii ya nyumbani."</string>
     <string name="invalid_hotseat_item" msgid="6545340627805449250">"Wijeti hii ni kubwa zaidi kwa hotseat."</string>
     <string name="shortcut_installed" msgid="7071557296331322355">"Njia ya mkato ya \"<xliff:g id="NAME">%s</xliff:g>\" imeundwa."</string>
@@ -61,7 +61,7 @@
     <string name="delete_zone_label_all_apps_system_app" msgid="3683920959591819044">"Sanidua sasisho"</string>
     <string name="menu_add" msgid="3065046628354640854">"Ongeza"</string>
     <string name="menu_manage_apps" msgid="2308685199463588895">"Dhibiti programu"</string>
-    <string name="menu_wallpaper" msgid="5837429080911269832">"Mandhari"</string>
+    <string name="menu_wallpaper" msgid="5837429080911269832">"Pazia"</string>
     <string name="menu_search" msgid="4826514464423239041">"Tafuta"</string>
     <string name="menu_notifications" msgid="6424587053194766192">"Arifa"</string>
     <string name="menu_settings" msgid="3946232973327980394">"Mipangilio ya mfumo"</string>
@@ -88,13 +88,13 @@
     <string name="workspace_scroll_format" msgid="7911126267695001437">"Nafasi ya kazi %1$d ya %2$d"</string>
     <string name="apps_customize_apps_scroll_format" msgid="5494241912377704885">"Ukurasa wa programu %1$d ya %2$d"</string>
     <string name="apps_customize_widgets_scroll_format" msgid="5383009742241717437">"Ukurasa wa wijeti %1$d ya %2$d"</string>
-    <string name="workspace_cling_title" msgid="738396473989890567">"Jisikie huru"</string>
-    <string name="workspace_cling_move_item" msgid="791013895761065070">"Unaweza kuweka programu unazozipenda zaidi hapa."</string>
-    <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Kutazama programu zako zote, gusa duara."</string>
-    <string name="all_apps_cling_title" msgid="2559734712581447107">"Chagua programu kadhaa"</string>
-    <string name="all_apps_cling_add_item" msgid="5665035103260318891">"Ili kuongeza programu kwa skrini yako ya Nyumbani, iguse na uishikilie."</string>
-    <string name="folder_cling_title" msgid="4308949882377840953">"Panga programu zako na folda"</string>
-    <string name="folder_cling_move_item" msgid="270598675060435169">"Kuhamisha programu, gusa na; uishikilie."</string>
+    <string name="workspace_cling_title" msgid="738396473989890567">"Jifanyie ujihisi nyumbani"</string>
+    <string name="workspace_cling_move_item" msgid="791013895761065070">"Unaweza kuweka prog zako uzipendazo hapa."</string>
+    <string name="workspace_cling_open_all_apps" msgid="2459977609848572588">"Kuangalia prog zako zote, gusa durara."</string>
+    <string name="all_apps_cling_title" msgid="2559734712581447107">"Chagua baadhi"</string>
+    <string name="all_apps_cling_add_item" msgid="5665035103260318891">"Ili kuongeza programu kwa skrini yako ya Nyumbani, gusa &amp; ishikilie."</string>
+    <string name="folder_cling_title" msgid="4308949882377840953">"Panga prog zako na folda"</string>
+    <string name="folder_cling_move_item" msgid="270598675060435169">"Kuhamisha prog, gusa na; uishikilie."</string>
     <string name="folder_cling_create_folder" msgid="8352867485656129478">"Kuunda folda mpya katika skrini yako ya nyumbani, rundika programu moja juu ya nyingine."</string>
     <string name="cling_dismiss" msgid="2780907108735868381">"Sawa"</string>
     <string name="folder_opened" msgid="4129072635480822768">"Folda imefunguliwa,%1$d na %2$d"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 73896b4..5ad3af9 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -32,7 +32,7 @@
     <string name="external_drop_widget_error" msgid="127440783198670829">"Không thể thả mục vào Màn hình chính này."</string>
     <string name="external_drop_widget_pick_title" msgid="7040647073452295370">"Chọn tiện ích con để tạo"</string>
     <string name="rename_folder_label" msgid="5646236631298452787">"Tên thư mục"</string>
-    <string name="rename_folder_title" msgid="4544573104191526550">"Đổi tên thư mục"</string>
+    <string name="rename_folder_title" msgid="4544573104191526550">"Đổi tên thư mục"</string>
     <string name="rename_action" msgid="6016003384693240896">"OK"</string>
     <string name="cancel_action" msgid="3811860427489435048">"Hủy"</string>
     <string name="menu_item_add_item" msgid="6233177331075781114">"Thêm vào Màn hình chính"</string>
@@ -43,7 +43,7 @@
     <string name="out_of_space" msgid="8365249326091984698">"Không còn khoảng trống trên Màn hình chính này."</string>
     <string name="invalid_hotseat_item" msgid="6545340627805449250">"Tiện ích này quá lớn cho điểm giới hạn."</string>
     <string name="shortcut_installed" msgid="7071557296331322355">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã được tạo."</string>
-    <string name="shortcut_uninstalled" msgid="2129499669449749995">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã bị xóa."</string>
+    <string name="shortcut_uninstalled" msgid="2129499669449749995">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã bị xoá."</string>
     <string name="shortcut_duplicate" msgid="4757756326465060694">"Lối tắt \"<xliff:g id="NAME">%s</xliff:g>\" đã tồn tại."</string>
     <string name="title_select_shortcut" msgid="2858897527672831763">"Chọn lối tắt"</string>
     <string name="title_select_application" msgid="1793455815754848652">"Chọn ứng dụng"</string>