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:
c9c6531
e28513f
)
Merge "IP connectivity metrics: fix LINGER/UNLINGER logging"
author
Hugo Benichi
<hugobenichi@google.com>
Wed, 15 Nov 2017 22:42:50 +0000
(22:42 +0000)
committer
android-build-merger
<android-build-merger@google.com>
Wed, 15 Nov 2017 22:42:50 +0000
(22:42 +0000)
am:
e28513f150
Change-Id: I6f10845788ba5558637703da6d8c5c41324935cc
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