Robert Greenwalt fe99eb7548 resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp ...

Change-Id: I7909f30fa5273693d115fd4b565f6c424c95dcc0

2011-03-11 14:05:14 -08:00

..

android/telephony

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

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

com/android/internal/telephony

resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp

2011-03-11 14:05:14 -08:00