tree 889fc96964a877f4f2a354c977a9eb1eabbc9642
parent a5d2367c644ac34f12a191fa1ec1274ccebf9435
parent cfd86991cbe82976b7ad540ac871988bc69ea2b9
author Doris Liu <tianliu@google.com> 1370990062 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1370990063 +0000

Merge "Disable zoom when camera does not support zoom" into gb-ub-photos-carlsbad