am e21217af: (-s ours) am c6b32054: am c826f92e: Merge "Revert "Do not merge. Return null id for Non-phone device."" into honeycomb-mr2

Browse Source

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

...

This commit is contained in:

John Wang 2011-06-16 17:20:06 -07:00 committed by Android Git Automerger

parent 472ad61aef cfa204826c

commit 01c92ac2a4

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