tree ecd7c1b5d04be0f3cef5a357481fe3b45cc51704
parent 1e8e52e5de1725d47101157b2328cbd76e9d9a83
parent b39e01c54b0d46b8a005e48e88537bc875b4977b
author Camera Software Integration <camswint@localhost> 1481625153 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> 1481625153 -0800

Merge "SnapdragonCamera: Show label and dialog when switch to new scene mode" into camera.lnx.1.0-dev.1.0