tree 1037a4ca6bc67618e3df05c91acc2d60fcca39c9
parent 9aa4e966fbe95afa53f70ca88c92c8e30ec0f9df
parent e9c89c814c97a74456ad1bf8d4c32a983663924c
author Nick Kralevich <nnk@google.com> 1391218883 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1391218883 +0000

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

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