tree 676e417d28b5658797131d57404d3625d3c80419
parent db0ea49051523552af59f1b336a4163b843908d8
parent e074fcbdb7d7bb20dde8173b969cbbafb53b92a9
author Doris Liu <tianliu@google.com> 1378776318 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378776318 -0700

am e074fcbd: Merge "Hide zoom view when back is pressed" into gb-ub-photos-carlsbad

* commit 'e074fcbdb7d7bb20dde8173b969cbbafb53b92a9':
  Hide zoom view when back is pressed