am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycomb-LTE

* commit '229d3a0cbce70db82003705abf6844deec136d20':
  Make getDeviceId return null for Non-phone device.
This commit is contained in:
John Wang 2011-06-09 11:25:50 -07:00 committed by Android Git Automerger
commit 01e9086e30

Diff Content Not Available