summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
author Danielle Millett <dmillett@google.com> 2012-05-29 06:24:05 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2012-05-29 06:24:05 -0700
commit45973d6d19eb9329d77e62004e80f63f111a27e5 (patch)
treeeb747f6df257b5c022cc681cbb4ebf0639534778 /libs
parentc3a5cf9aab3d409445accb2a93c09e6b4140d196 (diff)
parentcafd387d7a2d91a2c900b7744b0486818cd1aac2 (diff)
Merge "Moved setting the flag to suppress face unlock during a phone call" into jb-dev
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions