am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

* commit '74ec580873bb56cb5045a25efdb1eb7e2bac384c':
  Add support for NETWORK_TYPE_GSM