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:
69ed0b6
dec3dda
)
resolved conflicts for merge of dec3dda8 to honeycomb-plus-aosp
author
Robert Greenwalt
<rgreenwalt@google.com>
Fri, 20 May 2011 22:45:55 +0000
(15:45 -0700)
committer
Robert Greenwalt
<rgreenwalt@google.com>
Fri, 20 May 2011 22:45:55 +0000
(15:45 -0700)
Change-Id: If14c7fc51c4549524c2f39797a902093582bae6d
1
2
services/java/com/android/server/ConnectivityService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/java/com/android/server/ConnectivityService.java
Simple merge
OSDN Git Service
