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:
7fec09d
17450e4
)
Merge \"Merge \\"Add an isListen method to NetworkRequests.\\" into nyc-mr1-dev am...
author
Lorenzo Colitti
<lorenzo@google.com>
Mon, 18 Jul 2016 15:15:33 +0000
(15:15 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Mon, 18 Jul 2016 15:15:33 +0000
(15:15 +0000)
am:
17450e41b3
Change-Id: Ic71a5722ee877de73e7ffd340a5ffb84a2d4910d
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