tree 957967ca93cd09aaa03a41ad7719f195496065a4
parent ba685bb83d8e44abaf70795e062d10b5a4145537
parent a4266a4aa7453b5ebb2b25e6affe0909fcf66946
author Wink Saville <wink@google.com> 1296623038 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1296623038 -0800

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

* commit '1bf518d8b333768e26bacf340f88f7d4ba8b9a91':
  Add TelephonyManager.getCurrentPhoneType