OSDN Git Service

am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce
authorJohn Hoford <hoford@google.com>
Mon, 20 May 2013 14:44:23 +0000 (07:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 20 May 2013 14:44:23 +0000 (07:44 -0700)
commitdd0e6379c6cf604e58449fd55774a495a9e88e75
tree51a99fba0daadce6a6520a190d344771cc86b0c9
parent1779c8c9b6406f52c03f700feb3f546204c838a8
parent26e3c48b831e39ced1db18673f12fb3c7a2d56d8
am 26e3c48b: Merge "Disable zoom" into gb-ub-photos-bryce

* commit '26e3c48b831e39ced1db18673f12fb3c7a2d56d8':
  Disable zoom
src/com/android/gallery3d/filtershow/imageshow/MasterImage.java