tree 6a74244d38557175a40284f248ebf414add7d0aa
parent 4a3d5b04daa74dc3bd5084b3395892b5565e6288
parent 6e6e5df754bb6f41a37500d5b1c45329a37ca326
author Brian Colonna <bcolonna@google.com> 1323185159 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1323185159 -0800

Merge "Making Face Unlock fix that wasn't proerly merged in master"