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

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