From: Nick Kralevich <nnk@google.com>
Date: Sat, 1 Feb 2014 01:34:39 +0000 (+0000)
Subject: Merge "gallery: change typo '&&' to '||'"
X-Git-Tag: android-x86-7.1-r1~64^2~10^2~6
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e9c89c814c97a74456ad1bf8d4c32a983663924c;p=android-x86%2Fpackages-apps-Gallery2.git

Merge "gallery: change typo '&&' to '||'"
---

e9c89c814c97a74456ad1bf8d4c32a983663924c