OSDN Git Service

am fc94d45f: Merge "Make getDeviceId return null for Non-phone device." into honeycom...
authorJohn Wang <johnwang@google.com>
Tue, 7 Jun 2011 22:56:19 +0000 (15:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 Jun 2011 22:56:19 +0000 (15:56 -0700)
* commit 'fc94d45fc209dbcfdf7f57e0c04c581e1e51988b':
  Make getDeviceId return null for Non-phone device.


Trivial merge