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

* commit 'ff34565fcb366d4bd0066bd7fe6f588e42a9a9cc':
  Add TelephonyManager.getCurrentPhoneType