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

..

android/telephony

resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp

2011-01-29 09:32:04 -08:00

com/android/internal/telephony

am f7784876: am b8498f1d: Merge "Fix data network type notifications." into honeycomb

2011-01-28 09:54:04 -08:00