tree 8ffd80ddb143171bcbac04156c39cb4b706e445a
parent 082541a730e56092b948580a8e8040be78979e23
parent 111e70bc1b962151a3cb5aef83914aad07185022
author John Hoford <hoford@google.com> 1369060964 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1369060964 +0000

Merge "Disable zoom" into gb-ub-photos-bryce