tree eb747f6df257b5c022cc681cbb4ebf0639534778
parent c3a5cf9aab3d409445accb2a93c09e6b4140d196
parent cafd387d7a2d91a2c900b7744b0486818cd1aac2
author Danielle Millett <dmillett@google.com> 1338297845 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1338297845 -0700

Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev