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:
0744f1d
411e79b
)
Merge changes I0cd83a93,I03ae2bbb into pi-dev
author
Chalard Jean
<jchalard@google.com>
Tue, 24 Apr 2018 10:02:11 +0000
(
03:02
-0700)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 24 Apr 2018 10:02:11 +0000
(
03:02
-0700)
am:
411e79b8b0
Change-Id: Iaa0285825735d3f16bba6e4946723a437fd9b0b9
1
2
services/core/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/ConnectivityService.java
Simple merge