Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2

This commit is contained in:
John Wang 2011-06-16 16:47:18 -07:00 committed by Android (Google) Code Review
commit 3c44627702

Diff Content Not Available