tree c765f086065cb76ea16bc87d86c150f92c5b8fa4
parent 86c2c5a0520f2947723af2ed490c0d9c6745f074
parent f16a9497a188f42c5a5ad4f9710a6c44f79a0e28
author Camera Software Integration <camswint@localhost> 1467646498 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1467646498 -0700

Merge "SnapdragonCamera: Use json file to read setting dependency" into camera.lnx.1.0-dev.1.0