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

Browse Source

* commit 'c826f92e6f90f4157afd4ed69c6907ff768a0d6b':
  Revert "Do not merge. Return null id for Non-phone device."

...

This commit is contained in:

John Wang 2011-06-16 16:50:05 -07:00 committed by Android Git Automerger

parent 2f5e3d3871 3c44627702

commit 0fcbbddfcf

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available