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:
f0e5501
a7238a3
)
Merge "Bug: 21588539 Move CHANGE_NETWORK_STATE to be in SYSTEM_SETTINGS" into mnc-dev
author
Billy Lau
<billylau@google.com>
Fri, 7 Aug 2015 22:16:03 +0000
(22:16 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Fri, 7 Aug 2015 22:16:03 +0000
(22:16 +0000)
1
2
core/java/android/net/ConnectivityManager.java
patch
|
diff1
|
diff2
|
blob
|
history
core/java/android/provider/Settings.java
patch
|
diff1
|
diff2
|
blob
|
history
core/res/AndroidManifest.xml
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
core/java/android/provider/Settings.java
Simple merge
diff --cc
core/res/AndroidManifest.xml
Simple merge
diff --cc
services/core/java/com/android/server/ConnectivityService.java
Simple merge
OSDN Git Service
