Merge "Fix 5185505: allow facelock to be enabled by a setting."

This commit is contained in:
Jim Miller 2011-10-03 22:00:03 -07:00 committed by Android (Google) Code Review
commit 48feb85c1b

Diff Content Not Available