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:
fada80d
41394a3
)
resolved conflicts for merge of 41394a36 to honeycomb-plus-aosp
author
Robert Greenwalt
<rgreenwalt@google.com>
Wed, 27 Jul 2011 16:27:00 +0000
(09:27 -0700)
committer
Robert Greenwalt
<rgreenwalt@google.com>
Wed, 27 Jul 2011 16:27:00 +0000
(09:27 -0700)
Change-Id: Ic839eb7bd8081b94802dbbf9140b9d1fa0cf7df3
1
2
core/java/android/os/INetworkManagementService.aidl
patch
|
diff1
|
diff2
|
blob
|
history
services/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/java/com/android/server/NetworkManagementService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
core/java/android/os/INetworkManagementService.aidl
Simple merge
diff --cc
services/java/com/android/server/ConnectivityService.java
Simple merge
diff --cc
services/java/com/android/server/NetworkManagementService.java
Simple merge