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:
2fa5800
f40f297
)
Merge "Fix the issue that uncrypt isn't called under quiescent mode" into oc-dev
author
Tianjie Xu
<xunchang@google.com>
Mon, 12 Jun 2017 23:55:23 +0000
(23:55 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 12 Jun 2017 23:55:23 +0000
(23:55 +0000)
am:
f40f297546
Change-Id: I06fa703be593348db7eed68e3905929262e43a9c
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