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:
3746d22
f3d8b81
)
Merge "Add WearWifiMediatorService to SystemServer." into nyc-mr1-dev
author
Nancy Zheng
<nzheng@google.com>
Mon, 11 Jul 2016 18:14:26 +0000
(18:14 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Mon, 11 Jul 2016 18:14:27 +0000
(18:14 +0000)
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
OSDN Git Service
