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:
75f7c57
ff4cc4e
)
Merge "Wait for keyguard draw before stopping boot animation" into oc-dev
author
Keun-young Park
<keunyoung@google.com>
Fri, 19 May 2017 20:14:50 +0000
(20:14 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Fri, 19 May 2017 20:14:50 +0000
(20:14 +0000)
am:
ff4cc4ebb5
Change-Id: I1c1437f83387aa4974ee991502018f5b59baf248
1
2
services/java/com/android/server/SystemServer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/SystemServer.java
Simple merge