tree ae9befbabffdd0ea52f45d3faa650211f0ac8b70
parent 74eb9b04b80f5791ec8c0c7674a42b5f06b92b49
parent dcd024a7c4ff03dfcdf3401230f0716f0be9c28a
author Camera Software Integration <camswint@localhost> 1480400312 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> 1480400312 -0800

Merge "SnapdragonCamera: Camera2 force close when zoom focus ring in video mode" into camera.lnx.1.0-dev.1.0