tree 99b98b041cf9e9455afe9da993f2a841cf8eb81e
parent 816e5b72190787f2b6136925c172a00ebcbe4077
parent fc94d45fc209dbcfdf7f57e0c04c581e1e51988b
author John Wang <johnwang@google.com> 1307487379 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1307487379 -0700

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

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