John Wang fe9aa2706f Revert "Do not merge. Return null id for Non-phone device." ...

This reverts commit cea03df201

2011-06-16 16:30:02 -07:00

..

java

Revert "Do not merge. Return null id for Non-phone device."

2011-06-16 16:30:02 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

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

tests

DO NOT MERGE: Revert "LTE Changes for Telephony including Multiple PDN support and IPV6 support"

2011-03-03 09:53:52 -08:00