OSDN Git Service

am 229d3a0c: am fc94d45f: Merge "Make getDeviceId return null for Non-phone device...
authorJohn Wang <johnwang@google.com>
Thu, 9 Jun 2011 18:25:50 +0000 (11:25 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 9 Jun 2011 18:25:50 +0000 (11:25 -0700)
commit01e9086e30e045d58233c2bfc4504301fb3c0384
tree713706e3b687bb494c536ef68d1314634302de9f
parentd1e0bf27b7d9ded30f31a573c5f79f9e2d46b2e1
parentf0bb18115c163c495da44ef27774121ab3a50e71
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.