Robert Greenwalt b46062bc08 am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp ...

* commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69':
  Add some network types that OEM's are asking for.

2011-01-29 09:35:28 -08:00

..

java

am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp

2011-01-29 09:35:28 -08:00

mockril

resolved conflicts for merge of d4e3bf4d to master

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

tests

Support for KSC5601 on SIM.

2010-12-21 10:26:48 -08:00