tree 885b4bd879d0d2d1eec8a61eb08d2ca83972a559
parent a2737beea11455c48b719c6d2f26d5908d4b8cd2
parent 2364af2083f4f0b00ae8275aed1aeb4193f4b89d
author Jorim Jaggi <jjaggi@google.com> 1440037502 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440037502 +0000

am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate" into mnc-dr-dev

* commit '2364af2083f4f0b00ae8275aed1aeb4193f4b89d':
  Save interactive/screen-on state in KeyguardServiceDelegate