commit 902bda398b9589492571f64ae4575fdbd62a095a
author Nick Kralevich <nnk@google.com> Sat Feb 01 01:41:23 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Sat Feb 01 01:41:23 2014 +0000
tree 1037a4ca6bc67618e3df05c91acc2d60fcca39c9
parent 9aa4e966fbe95afa53f70ca88c92c8e30ec0f9df
parent e9c89c814c97a74456ad1bf8d4c32a983663924c

am e9c89c81: Merge "gallery: change typo \'&&\' to \'||\'"

* commit 'e9c89c814c97a74456ad1bf8d4c32a983663924c':
  gallery: change typo '&&' to '||'

src/com/android/gallery3d/app/AlbumSetDataLoader.java

diff --git a/src/com/android/gallery3d/app/AlbumSetDataLoader.java b/src/com/android/gallery3d/app/AlbumSetDataLoader.java
index cf380f8..909d910 100644
--- a/src/com/android/gallery3d/app/AlbumSetDataLoader.java
+++ b/src/com/android/gallery3d/app/AlbumSetDataLoader.java
@@ -115,7 +115,7 @@
     }
 
     private void assertIsActive(int index) {
-        if (index < mActiveStart && index >= mActiveEnd) {
+        if (index < mActiveStart || index >= mActiveEnd) {
             throw new IllegalArgumentException(String.format(
                     "%s not in (%s, %s)", index, mActiveStart, mActiveEnd));
         }