commit | db71e5ec61dfb70e98efa22e9b8336cfd119638b | [log] [tgz] |
---|---|---|
author | 高艳龙 <gaoyl1997@thundersoft.com> | Mon May 25 09:34:02 2015 +0800 |
committer | Gerrit Code Review <scm@thundersoft.com> | Mon May 25 09:34:02 2015 +0800 |
tree | 43562043f6121fd7f66a294b954e2b659881156d | |
parent | a7d8354dc1e229134ae92a06fbbcaf491406673f [diff] | |
parent | 0a1950a55d29f16373f1b3a273521502e524cdb6 [diff] |
Merge "FPII-373:set the camera to preview state when unlock the screen" into fp2-dev-v2