am fb2b04b7: Unhide NETWORK_TYPE_XXX.

Merge commit 'fb2b04b7bc505f5e600e360a9de6f63e16c21bf9' into eclair-plus-aosp

* commit 'fb2b04b7bc505f5e600e360a9de6f63e16c21bf9':
  Unhide NETWORK_TYPE_XXX.