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:
fe86a19
dba33db
)
Merge "ConnectivityManager: remove obsolete callback types"
author
Hugo Benichi
<hugobenichi@google.com>
Thu, 20 Apr 2017 12:38:27 +0000
(12:38 +0000)
committer
Gerrit Code Review
<noreply-gerritcodereview@google.com>
Thu, 20 Apr 2017 12:38:29 +0000
(12:38 +0000)
1
2
core/java/android/net/ConnectivityManager.java
patch
|
diff1
|
diff2
|
blob
|
history
services/core/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/net/ConnectivityManager.java
Simple merge
diff --cc
services/core/java/com/android/server/ConnectivityService.java
Simple merge