am 2859b6f2: (-s ours) Merge "DO NOT MERGE Check "hardware_id" Property" into froyo

Merge commit '2859b6f20e5e9941d5d8062f328cd42c61925be6' into froyo

* commit '2859b6f20e5e9941d5d8062f328cd42c61925be6':
  DO NOT MERGE Check "hardware_id" Property