OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Jun 2010 21:18:59 +0000 (14:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 22 Jun 2010 21:18:59 +0000 (14:18 -0700)
Change-Id: I0628d21b4bf629896dad7b9b5b6a9357021e1278

1  2 
include/telephony/ril.h
libril/ril.cpp

Simple merge
diff --cc libril/ril.cpp
Simple merge