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

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