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:
0df9858
17c3e0f
)
Merge "Remove unused api."
author
Robert Greenwalt
<rgreenwalt@google.com>
Mon, 7 Jul 2014 17:34:21 +0000
(17:34 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Wed, 2 Jul 2014 18:55:10 +0000
(18:55 +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