am 6b739dc7: Merge "Add some network types that OEM\'s are asking for." into gingerbread

* commit '6b739dc7292452227cdd8abd90658f4db8f0ce70':
  Add some network types that OEM's are asking for.
tree: 77f38e3b0e660c2db45ee305636d641834a98acf
  1. core/
  2. services/