OSDN Git Service

Merge branch 'aosp-fix' into gingerbread-x86 gingerbread-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 2 May 2011 10:59:19 +0000 (18:59 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Mon, 2 May 2011 10:59:19 +0000 (18:59 +0800)
1  2 
include/telephony/ril.h
rild/rild.c

Simple merge
diff --cc rild/rild.c
Simple merge