am 1bf518d8: Merge "Add TelephonyManager.getCurrentPhoneType" into honeycomb

* commit '1bf518d8b333768e26bacf340f88f7d4ba8b9a91':
  Add TelephonyManager.getCurrentPhoneType
tree: 957967ca93cd09aaa03a41ad7719f195496065a4
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE