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:
1f9f859
f55c1ae
)
Merge "Nat464Xlat: interface notification handler on ConnectivityService" am: 91817b3...
author
Hugo Benichi
<hugobenichi@google.com>
Tue, 29 Aug 2017 05:42:07 +0000
(
05:42
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Tue, 29 Aug 2017 05:42:07 +0000
(
05:42
+0000)
am:
f55c1ae9b6
Change-Id: I9116a493ca1cbdf6a25664a1b0017aa6c9b38eb4
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