Wink Saville 1146bddf92 Merge "Always clear settings when entering Inactive state." into honeycomb-LTE

2011-06-15 14:31:16 -07:00

..

java

Merge "Always clear settings when entering Inactive state." into honeycomb-LTE

2011-06-15 14:31:16 -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