tree 435dc953671b5f723a7054adfb598a3ca973ff45
parent b6c6e45a04a52a7ece08dd63636b1f71e7322653
parent d9f1a0c3a42bcc1f7b8cd82be8eed60f5438f091
author Selim Cinek <cinek@google.com> 1437789266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437789266 +0000

am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev

* commit 'd9f1a0c3a42bcc1f7b8cd82be8eed60f5438f091':
  Fixed wake to unlock when the device has never been unlocked