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)
* commit '229d3a0cbce70db82003705abf6844deec136d20':
  Make getDeviceId return null for Non-phone device.


Trivial merge