am c8da3ddf: (-s ours) am 7fbae1d2: Merge "Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer." into honeycomb-LTE

* commit 'c8da3ddf3df453f57773d5f0b1bd1be68760d611':
  Do not merge: ApnSettings: Removal of Enabled, Class and Inactivity Timer.