OSDN Git Service

am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device.""...
authorJohn Wang <johnwang@google.com>
Thu, 16 Jun 2011 23:50:05 +0000 (16:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 16 Jun 2011 23:50:05 +0000 (16:50 -0700)
commitc6b32054c67901b0627ad99e4bd8b15c5cc2fb90
tree5d439fc0d9cdfcb2f893a4a99916cff6b49baa3f
parent9a73c4d3a9c7ce02f80b078ca9ba5106234ecd9c
parentc826f92e6f90f4157afd4ed69c6907ff768a0d6b
am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2

* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
  Revert "Do not merge. Return null id for Non-phone device."
telephony/java/android/telephony/TelephonyManager.java