tree 0816ed0fdebcf8542cbf8c440792c2f0743d8bbf
parent b75fd7ad4e575cf9bd6ca02cb14bce087869e82c
parent eef1ae1d91d55341c25d01547ac9b952be5aa658
author Brian Colonna <bcolonna@google.com> 1317042182 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1317042182 -0700

Merge "FaceLock is now closed if emergency dial button is pressed"