Xia Wang a5496cd28c resolved conflicts for merge of d4e3bf4d to master ...

Change-Id: I41c0ae2b3f557f84b25c39e247894f66a4e7e702

2010-10-12 11:05:54 -07:00

..

src/com/android/internal/telephony/mockril

resolved conflicts for merge of d4e3bf4d to master

2010-10-12 11:05:54 -07:00

Android.mk

Port mock ril controller and tests to GB. DO NOT MERGE

2010-10-07 11:34:46 -07:00