Robert Greenwalt 66a09d0a17 am 618377d8: Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp ...

* commit '618377d83d4a280c2e0f89642bfb1046d387ad7d':
  Don't accept a user-defined dun-capable connection

2011-03-11 15:17:44 -08:00

..

java

am 618377d8: Merge "resolved conflicts for merge of 55b53d35 to honeycomb-plus-aosp" into honeycomb-plus-aosp

2011-03-11 15:17:44 -08:00

mockril

resolved conflicts for merge of d4e3bf4d to master

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

tests

am b028ce55: Merge "Add a protocol property to the APNs and use it." into gingerbread

2011-03-03 17:07:56 -08:00