tree bfa24a652f7e1543fff7e94d39e84c4070f1a1a0
parent 225e9d7cdc7e17159af790cc1a30d44062015114
parent a679df892433f8847eb41c89c6a5e846fa0b2883
author Camera Software Integration <camswint@localhost> 1489070386 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> 1489070386 -0800

Merge "SnapdragonCamera: ZSL and manual 3A can be on at same time" into camera.lnx.1.0-dev.1.0