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

* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
  Make getDeviceId return null for Non-phone device.

2011-06-07 15:56:19 -07:00

..

android/telephony

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

2011-06-07 15:56:19 -07:00

com/android/internal/telephony

resolved conflicts for merge of 0cb17a52 to honeycomb-plus-aosp

2011-06-07 15:01:50 -07:00