Wink Saville d649887a43 am eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE ...

* commit 'eb8da0fec2ea577f14e5c5c4dcca1eea0b8261fc':
  Fix issue on infinite retry config in RetryManager

2011-05-09 20:34:24 -07:00

..

java

am eb8da0fe: Merge "Fix issue on infinite retry config in RetryManager" into honeycomb-LTE

2011-05-09 20:34:24 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

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

tests

Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.

2011-03-14 12:39:01 -07:00