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:
41bd1e5
955b575
)
am 955b575d: am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService"
author
Robert Greenwalt
<rgreenwalt@google.com>
Wed, 13 Nov 2013 18:33:56 +0000
(10:33 -0800)
committer
Android Git Automerger
<android-git-automerger@android.com>
Wed, 13 Nov 2013 18:33:56 +0000
(10:33 -0800)
* commit '
955b575dd94370f618f6b6424d60c1aa9dc34c14
':
Fix NPE in ConnectivityService
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