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)
commit9a2f5113fd1db1e1605daad47b16b6f960045582
tree4db4ad2ba58cd8b70755f8b6d00e9b2f448487e9
parentdc5045360b73de2f4ebba0e212b426e31e59ec06
parent7edd07c9184a3abfaa3f4a161b74b3da9d7bbd56
merge from open-source master

Change-Id: I0628d21b4bf629896dad7b9b5b6a9357021e1278
include/telephony/ril.h
libril/ril.cpp