tree fbf929c1935c06542d4b25ad416a301e1d83f7d8
parent 569601c90974cbd8f5f149eb1bf670d91add7d82
parent 9a351414d4e634f09313ca27c286d919b1b43636
author Camera Software Integration <camswint@localhost> 1481458980 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> 1481458980 -0800

Merge "SnapdragonCamera: Keep screen on when recording the video" into camera.lnx.1.0-dev.1.0