diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..5217736
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,6 @@
+android_app {
+    name: "Gallery",
+    srcs: ["src/**/*.java"],
+    platform_apis: true,
+    certificate: "media",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index a5e3938..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := Gallery
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_CERTIFICATE := media
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..fe9f33f
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+# This project has no significant updates recently.
+# Please update this list if you find better candidates.
+rtenneti@google.com
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 516cba1..20a5913 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -17,18 +17,18 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="all_images" msgid="1195501551939178807">"جميع الصور"</string>
-    <string name="all_videos" msgid="3380966619230896013">"جميع الفيديوهات"</string>
+    <string name="all_videos" msgid="3380966619230896013">"جميع مقاطع الفيديو"</string>
     <string name="camera_label" msgid="6346560772074764302">"الكاميرا"</string>
     <string name="gallery_picker_label" msgid="3080425245006492787">"المعرض"</string>
     <string name="gallery_label" msgid="7119609703856708011">"المعرض"</string>
     <string name="gallery_camera_bucket_name" msgid="2924618424339240831">"صور الكاميرا"</string>
-    <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"فيديوهات الكاميرا"</string>
+    <string name="gallery_camera_videos_bucket_name" msgid="3369151581398551623">"مقاطع فيديو الكاميرا"</string>
     <string name="gallery_camera_media_bucket_name" msgid="5560926838411387511">"وسائط الكاميرا"</string>
     <string name="crop_label" msgid="521114301871349328">"اقتصاص الصورة"</string>
     <string name="view_label" msgid="4450531507947335704">"عرض الصورة"</string>
     <string name="preferences_label" msgid="5955678162525051163">"إعدادات الكاميرا"</string>
     <string name="wait" msgid="8600187532323801552">"يرجى الانتظار…"</string>
-    <string name="no_storage" product="nosdcard" msgid="4006727786803418058">"يجب تثبيت وحدة التخزين المشتركة قبل استخدام الكاميرا."</string>
+    <string name="no_storage" product="nosdcard" msgid="4006727786803418058">"يجب تحميل وحدة التخزين المشتركة قبل استخدام الكاميرا."</string>
     <string name="no_storage" product="default" msgid="6680362958795677723">"‏يجب إدراج بطاقة SD حتى تتمكن من استخدام الكاميرا."</string>
     <string name="not_enough_space" product="nosdcard" msgid="7966388882416357252">"وحدة التخزين المشتركة ممتلئة."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"‏بطاقة SD ممتلئة."</string>
@@ -69,14 +69,14 @@
     <string name="pref_gallery_category" msgid="5826488887237959433">"إعدادات عامة"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"إعدادات عرض الشرائح"</string>
     <string name="pref_gallery_size_title" msgid="1363406603879434418">"حجم الشاشة"</string>
-    <string name="pref_gallery_size_summary" msgid="7365675768755956361">"اختيار حجم عرض الصور والفيديوهات"</string>
+    <string name="pref_gallery_size_summary" msgid="7365675768755956361">"اختيار حجم عرض الصور ومقاطع الفيديو"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"حجم الصورة"</string>
   <string-array name="pref_gallery_size_choices">
     <item msgid="7157691836846678936">"كبير"</item>
     <item msgid="1033164600689216410">"صغيرة"</item>
   </string-array>
     <string name="pref_gallery_sort_title" msgid="7447949250045443386">"ترتيب التصنيف"</string>
-    <string name="pref_gallery_sort_summary" msgid="4406174975925645225">"اختيار ترتيب التصنيف للصور والفيديوهات"</string>
+    <string name="pref_gallery_sort_summary" msgid="4406174975925645225">"اختيار ترتيب التصنيف للصور ومقاطع الفيديو"</string>
     <string name="pref_gallery_sort_dialogtitle" msgid="5787417105532562739">"تصنيف الصورة"</string>
   <string-array name="pref_gallery_sort_choices">
     <item msgid="5546009539334018063">"الأحدث أولاً"</item>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
deleted file mode 100644
index 814961c..0000000
--- a/res/values-as/strings.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  Copyright (C) 2007 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
- -->
-
-<resources xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for all_images (1195501551939178807) -->
-    <skip />
-    <!-- no translation found for all_videos (3380966619230896013) -->
-    <skip />
-    <!-- no translation found for camera_label (6346560772074764302) -->
-    <skip />
-    <!-- no translation found for gallery_picker_label (3080425245006492787) -->
-    <skip />
-    <!-- no translation found for gallery_label (7119609703856708011) -->
-    <skip />
-    <!-- no translation found for gallery_camera_bucket_name (2924618424339240831) -->
-    <skip />
-    <!-- no translation found for gallery_camera_videos_bucket_name (3369151581398551623) -->
-    <skip />
-    <!-- no translation found for gallery_camera_media_bucket_name (5560926838411387511) -->
-    <skip />
-    <!-- no translation found for crop_label (521114301871349328) -->
-    <skip />
-    <!-- no translation found for view_label (4450531507947335704) -->
-    <skip />
-    <!-- no translation found for preferences_label (5955678162525051163) -->
-    <skip />
-    <!-- no translation found for wait (8600187532323801552) -->
-    <skip />
-    <!-- no translation found for no_storage (4006727786803418058) -->
-    <skip />
-    <!-- no translation found for no_storage (6680362958795677723) -->
-    <skip />
-    <!-- no translation found for not_enough_space (7966388882416357252) -->
-    <skip />
-    <!-- no translation found for not_enough_space (6655334407957844653) -->
-    <skip />
-    <!-- no translation found for preparing_sd (183917364005592061) -->
-    <skip />
-    <!-- no translation found for preparing_sd (2914969119574812666) -->
-    <skip />
-    <!-- no translation found for wallpaper (140165383777262070) -->
-    <skip />
-    <!-- no translation found for savingImage (3051745378545909260) -->
-    <skip />
-    <!-- no translation found for runningFaceDetection (2293932204708167704) -->
-    <skip />
-    <!-- no translation found for view (6277795271119411881) -->
-    <skip />
-    <string name="details" msgid="8415120088556445230">"সবিশেষ"</string>
-    <!-- no translation found for show_on_map (441725587731006228) -->
-    <skip />
-    <!-- no translation found for rotate (460017689320955494) -->
-    <skip />
-    <!-- no translation found for rotate_left (5888273317282539839) -->
-    <skip />
-    <!-- no translation found for rotate_right (6776325835923384839) -->
-    <skip />
-    <!-- no translation found for slide_show (1965192737233824143) -->
-    <skip />
-    <!-- no translation found for multiselect (4761682939945434146) -->
-    <skip />
-    <!-- no translation found for capture_picture (4114265595549284643) -->
-    <skip />
-    <!-- no translation found for capture_video (4047046282358697155) -->
-    <skip />
-    <!-- no translation found for crop_save_text (8140440041190264400) -->
-    <skip />
-    <!-- no translation found for crop_discard_text (5303657888280340603) -->
-    <skip />
-    <!-- no translation found for confirm_delete_title (263478358046514887) -->
-    <skip />
-    <!-- no translation found for confirm_delete_message (2141726810668595858) -->
-    <skip />
-    <!-- no translation found for confirm_delete_video_message (800016540763376529) -->
-    <skip />
-    <!-- no translation found for confirm_delete_multiple_message (5184550162588396436) -->
-    <skip />
-    <!-- no translation found for camera_toss (3781186798552460833) -->
-    <skip />
-    <!-- no translation found for camera_share (8207701858325694182) -->
-    <skip />
-    <!-- no translation found for camera_set (3422192914806971182) -->
-    <skip />
-    <!-- no translation found for camera_play (8248000517869959980) -->
-    <skip />
-    <!-- no translation found for camera_attach (4048659554893435232) -->
-    <skip />
-    <!-- no translation found for camera_cancel (8203341746672085747) -->
-    <skip />
-    <!-- no translation found for camera_crop (5584000454518174632) -->
-    <skip />
-    <!-- no translation found for no_way_to_share_image (7980215622010396797) -->
-    <skip />
-    <!-- no translation found for no_way_to_share_video (4506167265329982928) -->
-    <skip />
-    <!-- no translation found for no_way_to_share (5276805314940059662) -->
-    <skip />
-    <!-- no translation found for video_play (5287787282508002895) -->
-    <skip />
-    <!-- no translation found for camera_pick_wallpaper (7026385960511811641) -->
-    <skip />
-    <!-- no translation found for camera_setas_wallpaper (797463183863414289) -->
-    <skip />
-    <!-- no translation found for pref_gallery_category (5826488887237959433) -->
-    <skip />
-    <!-- no translation found for pref_slideshow_category (9097962086335681667) -->
-    <skip />
-    <!-- no translation found for pref_gallery_size_title (1363406603879434418) -->
-    <skip />
-    <!-- no translation found for pref_gallery_size_summary (7365675768755956361) -->
-    <skip />
-    <!-- no translation found for pref_gallery_size_dialogtitle (757380558320647503) -->
-    <skip />
-    <!-- no translation found for pref_gallery_size_choices:0 (7157691836846678936) -->
-    <!-- no translation found for pref_gallery_size_choices:1 (1033164600689216410) -->
-    <!-- no translation found for pref_gallery_sort_title (7447949250045443386) -->
-    <skip />
-    <!-- no translation found for pref_gallery_sort_summary (4406174975925645225) -->
-    <skip />
-    <!-- no translation found for pref_gallery_sort_dialogtitle (5787417105532562739) -->
-    <skip />
-    <!-- no translation found for pref_gallery_sort_choices:0 (5546009539334018063) -->
-    <!-- no translation found for pref_gallery_sort_choices:1 (7931283047572866748) -->
-    <!-- no translation found for pref_gallery_slideshow_interval_title (6534904787962619832) -->
-    <skip />
-    <!-- no translation found for pref_gallery_slideshow_interval_summary (25973922639324614) -->
-    <skip />
-    <!-- no translation found for pref_gallery_slideshow_interval_dialogtitle (6775543119826248900) -->
-    <skip />
-    <!-- no translation found for pref_gallery_slideshow_interval_choices:0 (3089037742117543119) -->
-    <!-- no translation found for pref_gallery_slideshow_interval_choices:1 (738579316565625730) -->
-    <!-- no translation found for pref_gallery_slideshow_interval_choices:2 (5670078787463530498) -->
-    <!-- no translation found for pref_gallery_slideshow_transition_title (3235158556228218846) -->
-    <skip />
-    <!-- no translation found for pref_gallery_slideshow_transition_summary (8294295294239125591) -->
-    <skip />
-    <!-- no translation found for pref_gallery_slideshow_transition_dialogtitle (5483406447721500371) -->
-    <skip />
-    <!-- no translation found for pref_gallery_slideshow_transition_choices:0 (2825716730899894863) -->
-    <!-- no translation found for pref_gallery_slideshow_transition_choices:1 (403116336404005687) -->
-    <!-- no translation found for pref_gallery_slideshow_transition_choices:2 (4901733079450971731) -->
-    <!-- no translation found for pref_gallery_slideshow_transition_choices:3 (9006732482485375438) -->
-    <!-- no translation found for pref_gallery_slideshow_repeat_title (6512135022461429738) -->
-    <skip />
-    <!-- no translation found for pref_gallery_slideshow_repeat_summary (8289230397431855268) -->
-    <skip />
-    <!-- no translation found for pref_gallery_slideshow_shuffle_title (3677508579783015598) -->
-    <skip />
-    <!-- no translation found for pref_gallery_slideshow_shuffle_summary (8566948749149325715) -->
-    <skip />
-    <!-- no translation found for camerasettings (2433519618178453928) -->
-    <skip />
-    <!-- no translation found for image_gallery_NoImageView_text (409595259802877447) -->
-    <skip />
-    <!-- no translation found for pref_gallery_confirm_delete_title (642429032687845907) -->
-    <skip />
-    <!-- no translation found for pref_gallery_confirm_delete_summary (5253456492765525245) -->
-    <skip />
-    <!-- no translation found for no_location_image (8907867717568887559) -->
-    <skip />
-    <!-- no translation found for details_panel_title (4753347516759338122) -->
-    <skip />
-    <!-- no translation found for details_file_size (2468878774843246797) -->
-    <skip />
-    <!-- no translation found for details_image_resolution (8773315928100529437) -->
-    <skip />
-    <!-- no translation found for details_image_make (2888477930210903540) -->
-    <skip />
-    <!-- no translation found for details_image_model (3608007849933924336) -->
-    <skip />
-    <!-- no translation found for details_image_whitebalance (4412514247882436065) -->
-    <skip />
-    <!-- no translation found for details_image_latitude (58222150203989546) -->
-    <skip />
-    <!-- no translation found for details_image_longitude (3792725587390654278) -->
-    <skip />
-    <!-- no translation found for details_image_location (6460201074393148978) -->
-    <skip />
-    <!-- no translation found for details_duration (1028116471387901402) -->
-    <skip />
-    <!-- no translation found for details_date_taken (348356840586463178) -->
-    <skip />
-    <!-- no translation found for details_frame_rate (122397836963498191) -->
-    <skip />
-    <!-- no translation found for details_bit_rate (5632311789455402186) -->
-    <skip />
-    <!-- no translation found for details_codec (5580300450432398126) -->
-    <skip />
-    <!-- no translation found for details_format (3700860266600796363) -->
-    <skip />
-    <!-- no translation found for details_dimension_x (4923037334136168978) -->
-    <skip />
-    <!-- no translation found for details_ms (7574063760642857397) -->
-    <skip />
-    <!-- no translation found for details_hms (772340067838331166) -->
-    <skip />
-    <!-- no translation found for details_fps (5450871169477340537) -->
-    <skip />
-    <!-- no translation found for details_kbps (1515369011744784592) -->
-    <skip />
-    <!-- no translation found for details_mbps (3291428849607323284) -->
-    <skip />
-    <!-- no translation found for details_ok (6848594369924424312) -->
-    <skip />
-    <!-- no translation found for context_menu_header (1185348426222302182) -->
-    <skip />
-    <!-- no translation found for video_context_menu_header (7318971116949475029) -->
-    <skip />
-    <!-- no translation found for multiface_crop_help (2554690102655855657) -->
-    <skip />
-    <!-- no translation found for photos_gallery_title (6914406246471015448) -->
-    <skip />
-    <!-- no translation found for pick_photos_gallery_title (8356086704733473321) -->
-    <skip />
-    <!-- no translation found for videos_gallery_title (6150354029982749479) -->
-    <skip />
-    <!-- no translation found for pick_videos_gallery_title (568436323607491495) -->
-    <skip />
-    <!-- no translation found for sendImage (7279510542799399570) -->
-    <skip />
-    <!-- no translation found for setImage (7246975856983303047) -->
-    <skip />
-    <!-- no translation found for sendVideo (3598567735831863073) -->
-    <skip />
-    <!-- no translation found for send_media_files (8201083279723850611) -->
-    <skip />
-    <!-- no translation found for movieviewlabel (7363495772706775465) -->
-    <skip />
-    <!-- no translation found for loading_video (4013492720121891585) -->
-    <skip />
-    <!-- no translation found for resume_playing_title (8996677350649355013) -->
-    <skip />
-    <!-- no translation found for resume_playing_message (8480340146814638566) -->
-    <skip />
-    <!-- no translation found for resume_playing_resume (3847915469173852416) -->
-    <skip />
-    <!-- no translation found for resume_playing_restart (5471008499835769292) -->
-    <skip />
-    <!-- no translation found for gadget_title (259405922673466798) -->
-    <skip />
-    <!-- no translation found for file_info_title (1628963357466012538) -->
-    <skip />
-    <!-- no translation found for video_exceed_mms_limit (3835075281230780010) -->
-    <skip />
-    <!-- no translation found for multiselect_share (5261644537749253581) -->
-    <skip />
-    <!-- no translation found for multiselect_delete (9113461994546744603) -->
-    <skip />
-    <!-- no translation found for multiselect_cancel (5969428692864002165) -->
-    <skip />
-    <!-- no translation found for delete_images_message (2332683687700452577) -->
-    <skip />
-</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index f272053..0d98742 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -107,7 +107,7 @@
     <string name="image_gallery_NoImageView_text" msgid="409595259802877447">"কোন মিডিয়া খুঁজে পাওয়া যায়নি।"</string>
     <string name="pref_gallery_confirm_delete_title" msgid="642429032687845907">"নিশ্চিতভাবে মোছা"</string>
     <string name="pref_gallery_confirm_delete_summary" msgid="5253456492765525245">"একটি ছবি বা ভিডিও মুছে ফেলার পূর্বে নিশ্চিতকরণ দেখান"</string>
-    <string name="no_location_image" msgid="8907867717568887559">"এই চিত্রটিতে সংরক্ষিত কোনো লোকেশন তথ্য নেই।"</string>
+    <string name="no_location_image" msgid="8907867717568887559">"এই চিত্রটিতে সংরক্ষিত কোনো অবস্থান তথ্য নেই।"</string>
     <string name="details_panel_title" msgid="4753347516759338122">"বিশদ বিবরণ"</string>
     <string name="details_file_size" msgid="2468878774843246797">"ফাইলের আকার:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"রেজোলিউশান:"</string>
@@ -116,7 +116,7 @@
     <string name="details_image_whitebalance" msgid="4412514247882436065">"হোয়াইট ব্যালেন্স:"</string>
     <string name="details_image_latitude" msgid="58222150203989546">"GPS অক্ষাংশ:"</string>
     <string name="details_image_longitude" msgid="3792725587390654278">"GPS দ্রাঘিমাংশ:"</string>
-    <string name="details_image_location" msgid="6460201074393148978">"লোকেশন:"</string>
+    <string name="details_image_location" msgid="6460201074393148978">"অবস্থান:"</string>
     <string name="details_duration" msgid="1028116471387901402">"সময়কাল:"</string>
     <string name="details_date_taken" msgid="348356840586463178">"তোলার তারিখ:"</string>
     <string name="details_frame_rate" msgid="122397836963498191">"ফ্রেম হার:"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 069ac45..672eeb2 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -126,7 +126,7 @@
     <string name="details_dimension_x" msgid="4923037334136168978">"<xliff:g id="WIDTH">%1$d</xliff:g> x <xliff:g id="HEIGHT">%2$d</xliff:g>"</string>
     <string name="details_ms" msgid="7574063760642857397">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string>
     <string name="details_hms" msgid="772340067838331166">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string>
-    <string name="details_fps" msgid="5450871169477340537">"<xliff:g id="FRAMES">%1$d</xliff:g> FPS"</string>
+    <string name="details_fps" msgid="5450871169477340537">"<xliff:g id="FRAMES">%1$d</xliff:g> fps"</string>
     <string name="details_kbps" msgid="1515369011744784592">"<xliff:g id="SPEED">%1$d</xliff:g> Kbps"</string>
     <string name="details_mbps" msgid="3291428849607323284">"<xliff:g id="SPEED">%1$g</xliff:g> Mbps"</string>
     <string name="details_ok" msgid="6848594369924424312">"D\'acord"</string>
diff --git a/res/values-or/strings.xml b/res/values-en-rXC/strings.xml
similarity index 96%
rename from res/values-or/strings.xml
rename to res/values-en-rXC/strings.xml
index 7afc18e..35583a8 100644
--- a/res/values-or/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -60,7 +60,7 @@
     <skip />
     <!-- no translation found for view (6277795271119411881) -->
     <skip />
-    <string name="details" msgid="8415120088556445230">"ବିବରଣୀ"</string>
+    <string name="details" msgid="8415120088556445230">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‏‏‎‎‏‎‎‎‏‎‎‎‎‎‏‏‎‎‏‎‎‎‏‎‏‎‏‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‎‏‏‏‎‎Details‎‏‎‎‏‎"</string>
     <!-- no translation found for show_on_map (441725587731006228) -->
     <skip />
     <!-- no translation found for rotate (460017689320955494) -->
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index f3dfb7c..bd74d44 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -28,7 +28,7 @@
     <string name="view_label" msgid="4450531507947335704">"चित्र देखें"</string>
     <string name="preferences_label" msgid="5955678162525051163">"कैमरा सेटिंग"</string>
     <string name="wait" msgid="8600187532323801552">"कृपया प्रतीक्षा करें..."</string>
-    <string name="no_storage" product="nosdcard" msgid="4006727786803418058">"आपको कैमरे का उपयोग करने से पहले शेयर मेमोरी को माउंट करना होगा."</string>
+    <string name="no_storage" product="nosdcard" msgid="4006727786803418058">"आपको कैमरे का उपयोग करने से पहले साझा मेमोरी को माउंट करना होगा."</string>
     <string name="no_storage" product="default" msgid="6680362958795677723">"आपको कैमरे का उपयोग करने से पहले SD कार्ड डालना होगा."</string>
     <string name="not_enough_space" product="nosdcard" msgid="7966388882416357252">"आपका शेयर किया गया मेमोरी पूरा भरा हुआ है."</string>
     <string name="not_enough_space" product="default" msgid="6655334407957844653">"आपका SD कार्ड भरा हुआ है."</string>
@@ -39,7 +39,7 @@
     <string name="runningFaceDetection" msgid="2293932204708167704">"कृपया प्रतीक्षा करें..."</string>
     <string name="view" msgid="6277795271119411881">"देखें"</string>
     <string name="details" msgid="8415120088556445230">"विवरण"</string>
-    <string name="show_on_map" msgid="441725587731006228">"मैप पर दिखाएं"</string>
+    <string name="show_on_map" msgid="441725587731006228">"मानचित्र पर दिखाएं"</string>
     <string name="rotate" msgid="460017689320955494">"घुमाएं"</string>
     <string name="rotate_left" msgid="5888273317282539839">"बाएं घुमाएं"</string>
     <string name="rotate_right" msgid="6776325835923384839">"दाएं घुमाएं"</string>
@@ -54,15 +54,15 @@
     <string name="confirm_delete_video_message" msgid="800016540763376529">"यह वीडियो हटाएं?"</string>
     <string name="confirm_delete_multiple_message" msgid="5184550162588396436">"इन मीडिया फ़ाइलों को हटाएं?"</string>
     <string name="camera_toss" msgid="3781186798552460833">"हटाएं"</string>
-    <string name="camera_share" msgid="8207701858325694182">"शेयर करें"</string>
+    <string name="camera_share" msgid="8207701858325694182">"साझा करें"</string>
     <string name="camera_set" msgid="3422192914806971182">"इस रूप में सेट करें"</string>
     <string name="camera_play" msgid="8248000517869959980">"चलाएं"</string>
     <string name="camera_attach" msgid="4048659554893435232">"जोड़ें"</string>
     <string name="camera_cancel" msgid="8203341746672085747">"अभी नहीं"</string>
     <string name="camera_crop" msgid="5584000454518174632">"काट-छांट करें"</string>
-    <string name="no_way_to_share_image" msgid="7980215622010396797">"चित्र शेयर करने के लिए कोई ऐप्स उपलब्‍ध नहीं है."</string>
-    <string name="no_way_to_share_video" msgid="4506167265329982928">"वीडियो को शेयर करने के लिए कोई ऐप्स उपलब्‍ध नहीं है."</string>
-    <string name="no_way_to_share" msgid="5276805314940059662">"मीडिया फ़ाइल (फ़ाइलों) को शेयर करने के लिए कोई ऐप्स उपलब्‍ध नहीं हैं."</string>
+    <string name="no_way_to_share_image" msgid="7980215622010396797">"चित्र साझा करने के लिए कोई ऐप्स उपलब्‍ध नहीं है."</string>
+    <string name="no_way_to_share_video" msgid="4506167265329982928">"वीडियो को साझा करने के लिए कोई ऐप्स उपलब्‍ध नहीं है."</string>
+    <string name="no_way_to_share" msgid="5276805314940059662">"मीडिया फ़ाइल (फ़ाइलों) को साझा करने के लिए कोई ऐप्स उपलब्‍ध नहीं हैं."</string>
     <string name="video_play" msgid="5287787282508002895">"चलाएं"</string>
     <string name="camera_pick_wallpaper" msgid="7026385960511811641">"चित्र"</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"वॉलपेपर"</string>
@@ -137,10 +137,10 @@
     <string name="pick_photos_gallery_title" msgid="8356086704733473321">"चित्र चुनें"</string>
     <string name="videos_gallery_title" msgid="6150354029982749479">"गैलरी"</string>
     <string name="pick_videos_gallery_title" msgid="568436323607491495">"वीडियो चुनें"</string>
-    <string name="sendImage" msgid="7279510542799399570">"इसके द्वारा चित्र शेयर करें"</string>
+    <string name="sendImage" msgid="7279510542799399570">"इसके द्वारा चित्र साझा करें"</string>
     <string name="setImage" msgid="7246975856983303047">"चित्र इस रूप में सेट करें"</string>
-    <string name="sendVideo" msgid="3598567735831863073">"इसके द्वारा वीडियो शेयर करें"</string>
-    <string name="send_media_files" msgid="8201083279723850611">"इसके द्वारा मीडिया फ़ाइलें शेयर करें"</string>
+    <string name="sendVideo" msgid="3598567735831863073">"इसके द्वारा वीडियो साझा करें"</string>
+    <string name="send_media_files" msgid="8201083279723850611">"इसके द्वारा मीडिया फ़ाइलें साझा करें"</string>
     <string name="movieviewlabel" msgid="7363495772706775465">"फिल्में"</string>
     <string name="loading_video" msgid="4013492720121891585">"वीडियो लोड हो रहा है..."</string>
     <string name="resume_playing_title" msgid="8996677350649355013">"वीडियो फिर से शुरू करें"</string>
@@ -150,7 +150,7 @@
     <string name="gadget_title" msgid="259405922673466798">"चित्र फ़्रेम"</string>
     <string name="file_info_title" msgid="1628963357466012538">"फ़ाइल जानकारी:"</string>
     <string name="video_exceed_mms_limit" msgid="3835075281230780010">"आपके द्वारा रिकॉर्ड किया गया वीडियो, MMS द्वारा भेजने में बहुत बड़ा है. छोटी अवधि वाली क्लिप रिकॉर्ड करने का प्रयास करें."</string>
-    <string name="multiselect_share" msgid="5261644537749253581">"शेयर करें"</string>
+    <string name="multiselect_share" msgid="5261644537749253581">"साझा करें"</string>
     <string name="multiselect_delete" msgid="9113461994546744603">"हटाएं"</string>
     <string name="multiselect_cancel" msgid="5969428692864002165">"अभी नहीं"</string>
     <string name="delete_images_message" msgid="2332683687700452577">"चित्र हटा रहा है…"</string>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index a83293a..ca87879 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -68,7 +68,7 @@
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"Тушкагаз"</string>
     <string name="pref_gallery_category" msgid="5826488887237959433">"Жалпы жөндөөлөр"</string>
     <string name="pref_slideshow_category" msgid="9097962086335681667">"Слайдшоу жөндөөлөрү"</string>
-    <string name="pref_gallery_size_title" msgid="1363406603879434418">"Чагылдыруучу өлчөм"</string>
+    <string name="pref_gallery_size_title" msgid="1363406603879434418">"Дисплей өлчөмү"</string>
     <string name="pref_gallery_size_summary" msgid="7365675768755956361">"Сүрөттөрдүн жана видеолордун экран ченемин тандоо"</string>
     <string name="pref_gallery_size_dialogtitle" msgid="757380558320647503">"Сүрөт өлчөмү"</string>
   <string-array name="pref_gallery_size_choices">
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1824848..2e0184b 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -28,14 +28,14 @@
     <string name="view_label" msgid="4450531507947335704">"चित्र पहा"</string>
     <string name="preferences_label" msgid="5955678162525051163">"कॅमेरा सेटिंग्ज"</string>
     <string name="wait" msgid="8600187532323801552">"कृपया प्रतीक्षा करा..."</string>
-    <string name="no_storage" product="nosdcard" msgid="4006727786803418058">"कॅमेरा वापरण्यापूर्वी तुम्हाला शेअर केलेले संचयन माउंट करण्याची आवश्यकता आहे."</string>
+    <string name="no_storage" product="nosdcard" msgid="4006727786803418058">"कॅमेरा वापरण्यापूर्वी आपल्याला सामायिक केलेले संचयन माउंट करण्याची आवश्यकता आहे."</string>
     <string name="no_storage" product="default" msgid="6680362958795677723">"कॅमेरा वापरण्यापूर्वी आपल्‍याला एक SD कार्ड घालण्‍याची आवश्‍यकता आहे."</string>
-    <string name="not_enough_space" product="nosdcard" msgid="7966388882416357252">"तुमचे शेअर संचयन पूर्ण भरले."</string>
-    <string name="not_enough_space" product="default" msgid="6655334407957844653">"तुमचे SD कार्ड पूर्ण भरले."</string>
-    <string name="preparing_sd" product="nosdcard" msgid="183917364005592061">"शेअर केलेले संचयन तयार करत आहे…"</string>
+    <string name="not_enough_space" product="nosdcard" msgid="7966388882416357252">"आपले सामायिक संचयन पूर्ण भरले."</string>
+    <string name="not_enough_space" product="default" msgid="6655334407957844653">"आपले SD कार्ड पूर्ण भरले."</string>
+    <string name="preparing_sd" product="nosdcard" msgid="183917364005592061">"सामायिक केलेले संचयन तयार करत आहे…"</string>
     <string name="preparing_sd" product="default" msgid="2914969119574812666">"SD कार्ड तयार करत आहे..."</string>
     <string name="wallpaper" msgid="140165383777262070">"वॉलपेपर सेट करत आहे…"</string>
-    <string name="savingImage" msgid="3051745378545909260">"चित्र सेव्ह करत आहे..."</string>
+    <string name="savingImage" msgid="3051745378545909260">"चित्र जतन करत आहे..."</string>
     <string name="runningFaceDetection" msgid="2293932204708167704">"कृपया प्रतीक्षा करा..."</string>
     <string name="view" msgid="6277795271119411881">"पहा"</string>
     <string name="details" msgid="8415120088556445230">"तपशील"</string>
@@ -54,15 +54,15 @@
     <string name="confirm_delete_video_message" msgid="800016540763376529">"हा व्हिडिओ हटवायचा?"</string>
     <string name="confirm_delete_multiple_message" msgid="5184550162588396436">"या मीडिया फायली हटवायच्या?"</string>
     <string name="camera_toss" msgid="3781186798552460833">"हटवा"</string>
-    <string name="camera_share" msgid="8207701858325694182">"शेअर करा"</string>
+    <string name="camera_share" msgid="8207701858325694182">"सामायिक करा"</string>
     <string name="camera_set" msgid="3422192914806971182">"हे म्हणून सेट करा"</string>
     <string name="camera_play" msgid="8248000517869959980">"प्ले करा"</string>
     <string name="camera_attach" msgid="4048659554893435232">"संलग्न करा"</string>
     <string name="camera_cancel" msgid="8203341746672085747">"रद्द करा"</string>
     <string name="camera_crop" msgid="5584000454518174632">"क्रॉप करा"</string>
-    <string name="no_way_to_share_image" msgid="7980215622010396797">"चित्र शेअर करण्यासाठी कोणताही अ‍ॅप उपलब्ध नाही."</string>
-    <string name="no_way_to_share_video" msgid="4506167265329982928">"व्‍हिडिओ शेअर करण्यासाठी कोणताही अ‍ॅप उपलब्ध नाही."</string>
-    <string name="no_way_to_share" msgid="5276805314940059662">"मीडिया फाईल(फायली) शेअर करण्यासाठी कोणताही अ‍ॅप उपलब्ध नाही."</string>
+    <string name="no_way_to_share_image" msgid="7980215622010396797">"चित्र सामायिक करण्यासाठी कोणताही अॅप उपलब्ध नाही."</string>
+    <string name="no_way_to_share_video" msgid="4506167265329982928">"व्‍हिडिओ सामायिक करण्यासाठी कोणताही अॅप उपलब्ध नाही."</string>
+    <string name="no_way_to_share" msgid="5276805314940059662">"मीडिया फाईल(फायली) सामायिक करण्यासाठी कोणताही अॅप उपलब्ध नाही."</string>
     <string name="video_play" msgid="5287787282508002895">"प्ले करा"</string>
     <string name="camera_pick_wallpaper" msgid="7026385960511811641">"चित्रे"</string>
     <string name="camera_setas_wallpaper" msgid="797463183863414289">"वॉलपेपर"</string>
@@ -107,7 +107,7 @@
     <string name="image_gallery_NoImageView_text" msgid="409595259802877447">"कोणताही मीडिया सापडला नाही."</string>
     <string name="pref_gallery_confirm_delete_title" msgid="642429032687845907">"हटविण्‍यांची पुष्‍टी करा"</string>
     <string name="pref_gallery_confirm_delete_summary" msgid="5253456492765525245">"चित्र किंवा व्हिडिओ हटविण्‍यापूर्वी पुष्टी दर्शवा"</string>
-    <string name="no_location_image" msgid="8907867717568887559">"या प्रतिमेमध्ये कोणतीही स्थान माहिती स्टोअर केलेली नाही."</string>
+    <string name="no_location_image" msgid="8907867717568887559">"या प्रतिमेमध्ये कोणतीही स्थान माहिती संचयित केलेली नाही."</string>
     <string name="details_panel_title" msgid="4753347516759338122">"तपशील"</string>
     <string name="details_file_size" msgid="2468878774843246797">"फाईल आकार:"</string>
     <string name="details_image_resolution" msgid="8773315928100529437">"रिजोल्यूशन:"</string>
@@ -137,10 +137,10 @@
     <string name="pick_photos_gallery_title" msgid="8356086704733473321">"चित्र निवडा"</string>
     <string name="videos_gallery_title" msgid="6150354029982749479">"गॅलरी"</string>
     <string name="pick_videos_gallery_title" msgid="568436323607491495">"व्हिडिओ निवडा"</string>
-    <string name="sendImage" msgid="7279510542799399570">"याद्वारे चित्र शेअर करा"</string>
+    <string name="sendImage" msgid="7279510542799399570">"याद्वारे चित्र सामायिक करा"</string>
     <string name="setImage" msgid="7246975856983303047">"चित्र या रूपात सेट करा"</string>
-    <string name="sendVideo" msgid="3598567735831863073">"याद्वारे व्‍हिडिओ शेअर करा"</string>
-    <string name="send_media_files" msgid="8201083279723850611">"याद्वारे मीडिया फायली शेअर करा"</string>
+    <string name="sendVideo" msgid="3598567735831863073">"याद्वारे व्‍हिडिओ सामायिक करा"</string>
+    <string name="send_media_files" msgid="8201083279723850611">"याद्वारे मीडिया फायली सामायिक करा"</string>
     <string name="movieviewlabel" msgid="7363495772706775465">"चित्रपट"</string>
     <string name="loading_video" msgid="4013492720121891585">"व्हिडिओ लोड करत आहे..."</string>
     <string name="resume_playing_title" msgid="8996677350649355013">"व्हिडिओ पुन्हा सुरु करा"</string>
@@ -149,8 +149,8 @@
     <string name="resume_playing_restart" msgid="5471008499835769292">"येथून प्रारंभ करा"</string>
     <string name="gadget_title" msgid="259405922673466798">"चित्र फ्रेम"</string>
     <string name="file_info_title" msgid="1628963357466012538">"फाईल माहिती:"</string>
-    <string name="video_exceed_mms_limit" msgid="3835075281230780010">"MMS द्वारे पाठविण्यासाठी तुम्ही रेकॉर्ड केलेला व्हिडिओ खूप मोठा आहे. एक लहान लांबीची क्लिप रेकॉर्ड करण्‍याचा प्रयत्न करा."</string>
-    <string name="multiselect_share" msgid="5261644537749253581">"शेअर करा"</string>
+    <string name="video_exceed_mms_limit" msgid="3835075281230780010">"MMS द्वारे पाठविण्यासाठी आपण रेकॉर्ड केलेला व्हिडिओ खूप मोठा आहे. एक लहान लांबीची क्लिप रेकॉर्ड करण्‍याचा प्रयत्न करा."</string>
+    <string name="multiselect_share" msgid="5261644537749253581">"सामायिक करा"</string>
     <string name="multiselect_delete" msgid="9113461994546744603">"हटवा"</string>
     <string name="multiselect_cancel" msgid="5969428692864002165">"रद्द करा"</string>
     <string name="delete_images_message" msgid="2332683687700452577">"इमेज हटवित आहे..."</string>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 63e50df..280ab0d 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -129,10 +129,10 @@
     <string name="details_fps" msgid="5450871169477340537">"<xliff:g id="FRAMES">%1$d</xliff:g> fps"</string>
     <string name="details_kbps" msgid="1515369011744784592">"<xliff:g id="SPEED">%1$d</xliff:g>Kbps"</string>
     <string name="details_mbps" msgid="3291428849607323284">"<xliff:g id="SPEED">%1$g</xliff:g> Mbps"</string>
-    <string name="details_ok" msgid="6848594369924424312">"ठिक छ"</string>
+    <string name="details_ok" msgid="6848594369924424312">"ठीक छ"</string>
     <string name="context_menu_header" msgid="1185348426222302182">"तस्बिर विकल्पहरू"</string>
     <string name="video_context_menu_header" msgid="7318971116949475029">"भिडियो विकल्पहरू"</string>
-    <string name="multiface_crop_help" msgid="2554690102655855657">"सुरु गर्नाका लागि एउटा अनुहार छुनुहोस्।"</string>
+    <string name="multiface_crop_help" msgid="2554690102655855657">"सुरु गर्नका लागि एउटा अनुहार छुनुहोस्।"</string>
     <string name="photos_gallery_title" msgid="6914406246471015448">"ग्यालरी"</string>
     <string name="pick_photos_gallery_title" msgid="8356086704733473321">"चित्र छान्नुहोस्"</string>
     <string name="videos_gallery_title" msgid="6150354029982749479">"ग्यालरी"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 8264be7..01a6149 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -101,7 +101,7 @@
   </string-array>
     <string name="pref_gallery_slideshow_repeat_title" msgid="6512135022461429738">"Repetir apresentação"</string>
     <string name="pref_gallery_slideshow_repeat_summary" msgid="8289230397431855268">"Reproduzir apresentação de slides mais de uma vez"</string>
-    <string name="pref_gallery_slideshow_shuffle_title" msgid="3677508579783015598">"Ordem aleatória"</string>
+    <string name="pref_gallery_slideshow_shuffle_title" msgid="3677508579783015598">"Reproduzir aleatoriamente"</string>
     <string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Mostrar imagens em ordem aleatória"</string>
     <string name="camerasettings" msgid="2433519618178453928">"Configurações"</string>
     <string name="image_gallery_NoImageView_text" msgid="409595259802877447">"Nenhuma mídia encontrada."</string>
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..e5879ac
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,13 @@
+android_test {
+    name: "GalleryTests",
+    certificate: "media",
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+    ],
+    static_libs: ["junit"],
+    // Include all test java files.
+    srcs: ["src/**/*.java"],
+    platform_apis: true,
+    instrumentation_for: "Gallery",
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index b71ee90..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-LOCAL_CERTIFICATE := media
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
-LOCAL_STATIC_JAVA_LIBRARIES := junit
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := GalleryTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_INSTRUMENTATION_FOR := Gallery
-
-include $(BUILD_PACKAGE)
-
-