Merge commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c' into eclair-plus-aosp * commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c': Unhide Camera lock and unlock API.
Merge commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c' into eclair-plus-aosp * commit 'ffe1cf251a4f8469695b8acfa37270684dc1b70c': Unhide Camera lock and unlock API.