am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device.

* commit 'fe682fd74d96f5a72259aed6dd27c02c8fc7caf7':
  Do not merge. Return null id for Non-phone device.
This commit is contained in:
John Wang 2011-06-08 14:04:37 -07:00 committed by Android Git Automerger
commit d8c83052bc

Diff Content Not Available