OSDN Git Service

(root) / android-x86 / hardware-ril.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d9f0c0 678966d)
am 678966d7: merge from open-source froyo
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Jul 2010 18:41:04 +0000 (11:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 14 Jul 2010 18:41:04 +0000 (11:41 -0700)
Merge commit '678966d7694d0c69c933bc7ff14886012358c200'

* commit '678966d7694d0c69c933bc7ff14886012358c200':
  Keep also the CAP_NET_RAW capability

1  2 
rild/rild.c patch | diff1 | diff2 | blob | history

diff --cc rild/rild.c
Simple merge
hardware/ril
About OSDN
Find Software
Develop Software
Help