OSDN Git Service

am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate"...
authorJorim Jaggi <jjaggi@google.com>
Thu, 20 Aug 2015 02:25:02 +0000 (02:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 20 Aug 2015 02:25:02 +0000 (02:25 +0000)
* commit '2364af2083f4f0b00ae8275aed1aeb4193f4b89d':
  Save interactive/screen-on state in KeyguardServiceDelegate


Trivial merge