Commits
Wu-cheng Li authored and Android Git Automerger committed 8f7bd3031a2M
am cd3a0242: am ffe1cf25: Unhide Camera lock and unlock API. Merge commit 'cd3a02425179ea881f3534d687c143a2ce683684' * commit 'cd3a02425179ea881f3534d687c143a2ce683684': Unhide Camera lock and unlock API.
Showing diff to330eafe792a