tree 29a2070e1838698b8a25f8cf5016b46d2e0451b5
parent 5d744d01626ef5d31e1533c4b81bac1d692cbd60
parent ebf9dcc648cb5faade3a59d155f696e7927923d0
author Camera Software Integration <camswint@localhost> 1465365597 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> 1465365597 -0700

Merge "SnapdragonCamera: Use mediarecorder resume instead of start" into camera.lnx.1.0-dev.1.0