OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6b13b0a
2364af2
)
am 2364af20: Merge "Save interactive/screen-on state in KeyguardServiceDelegate"...
author
Jorim Jaggi
<jjaggi@google.com>
Thu, 20 Aug 2015 02:25:18 +0000
(
02:25
+0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 20 Aug 2015 02:25:18 +0000
(
02:25
+0000)
* commit '
2364af2083f4f0b00ae8275aed1aeb4193f4b89d
':
Save interactive/screen-on state in KeyguardServiceDelegate
Trivial merge