am 9fa7048c: am 6158038a: Merge change I2811f162 into eclair

Merge commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2' into eclair-mr2-plus-aosp

* commit '9fa7048ca3a7b5184ce761bbf908c512d524b9e2':
  Add Authentication Type field to the APN settings.