Snap for 10453938 from 30ca446b5dafaec0e318a5877ad70f356c6aa820 to mainline-odp-releaseaml_odp_341812000aml_odp_341717000aml_odp_341610000aml_odp_341812000

Change-Id: I7b7e98712f5accc88732c754fa1450228932663c

5 files changed, 7 insertions, 7 deletions

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 0b760c7..252c42e 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -19,7 +19,7 @@
     <string name="app_name" msgid="6441943862284988546">"ফট\' স্ক্ৰীণছেভাৰ"</string>
     <string name="table_screensaver_name" msgid="1150228032617397055">"ফট\' তালিকা"</string>
     <string name="flipper_screensaver_name" msgid="6988572107391523141">"ফট\' ফ্ৰেম"</string>
-    <string name="posts_album_name" msgid="5628151551239729515">"প\'ষ্টৰ পৰা সংগ্ৰহিত ফটো"</string>
+    <string name="posts_album_name" msgid="5628151551239729515">"প\'ষ্টৰ পৰা সংগ্ৰহিত ফট’"</string>
     <string name="unknown_album_name" msgid="2135521368192091267">"নামবিহীন এলবাম"</string>
     <string name="stock_photo_album_name" msgid="3150527596227525460">"ফট\' ভাণ্ডাৰ"</string>
     <string name="local_source_name" msgid="6487253091085518505">"ডিভাইচত থকা ফট\'বোৰ"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 6e661d9..234b853 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -19,9 +19,9 @@
     <string name="app_name" msgid="6441943862284988546">"Photo Screensavers"</string>
     <string name="table_screensaver_name" msgid="1150228032617397055">"Photo Table"</string>
     <string name="flipper_screensaver_name" msgid="6988572107391523141">"Photo Frame"</string>
-    <string name="posts_album_name" msgid="5628151551239729515">"Photos From Posts"</string>
+    <string name="posts_album_name" msgid="5628151551239729515">"Photos from Posts"</string>
     <string name="unknown_album_name" msgid="2135521368192091267">"Unnamed Album"</string>
-    <string name="stock_photo_album_name" msgid="3150527596227525460">"Stock photos"</string>
+    <string name="stock_photo_album_name" msgid="3150527596227525460">"Stock Photos"</string>
     <string name="local_source_name" msgid="6487253091085518505">"Photos on Device"</string>
     <string name="need_to_configure" msgid="1269102638159389032">"No photos selected."</string>
     <string name="photodream_select_all" msgid="6364858563337927827">"Select All"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 18d347f..4589ab2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -24,7 +24,7 @@
     <string name="stock_photo_album_name" msgid="3150527596227525460">"Fotografii din stoc"</string>
     <string name="local_source_name" msgid="6487253091085518505">"Fotografii de pe dispozitiv"</string>
     <string name="need_to_configure" msgid="1269102638159389032">"Nu a fost selectată nicio fotografie."</string>
-    <string name="photodream_select_all" msgid="6364858563337927827">"Selectați tot"</string>
-    <string name="photodream_select_none" msgid="8816452124894525861">"Deselectați tot"</string>
+    <string name="photodream_select_all" msgid="6364858563337927827">"Selectează tot"</string>
+    <string name="photodream_select_none" msgid="8816452124894525861">"Deselectează tot"</string>
     <string name="no_photos" msgid="4262083523147564199">"Nu există fotografii pe dispozitiv."</string>
 </resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index f1a818d..8d559fc 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -25,6 +25,6 @@
     <string name="local_source_name" msgid="6487253091085518505">"పరికరంలో ఫోటోలు"</string>
     <string name="need_to_configure" msgid="1269102638159389032">"ఫోటోలు ఏవీ ఎంచుకోబడలేదు."</string>
     <string name="photodream_select_all" msgid="6364858563337927827">"అన్నీ ఎంచుకోండి"</string>
-    <string name="photodream_select_none" msgid="8816452124894525861">"అన్ని ఎంపికలను తీసివేయి"</string>
+    <string name="photodream_select_none" msgid="8816452124894525861">"అన్ని ఎంపికలను తీసివేయండి"</string>
     <string name="no_photos" msgid="4262083523147564199">"పరికరంలో ఫోటోలు లేవు."</string>
 </resources>
diff --git a/src/com/android/dreams/phototable/PhotoSource.java b/src/com/android/dreams/phototable/PhotoSource.java
index d05eace..5b554ee 100644
--- a/src/com/android/dreams/phototable/PhotoSource.java
+++ b/src/com/android/dreams/phototable/PhotoSource.java
@@ -276,7 +276,7 @@ public abstract class PhotoSource {
         if (max >= total) {
             return -1;
         } else {
-            return (mRNG.nextInt() % (total - max)) - 1;
+            return mRNG.nextInt(total - max) - 1;
         }
     }