am 1861225b: (-s ours) am fe682fd7: am cea03df2: Do not merge. Return null id for Non-phone device.

* commit '1861225be3c848fdf395f7aa815c673af4239011':
  Do not merge. Return null id for Non-phone device.
This commit is contained in:
John Wang 2011-06-09 11:56:28 -07:00 committed by Android Git Automerger
commit eb68e8bf07

Diff Content Not Available