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