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

Merge commit '77b1b39ed9573a5f48ad156c9c5d94e1f08bc23f' into gingerbread

* commit '77b1b39ed9573a5f48ad156c9c5d94e1f08bc23f':
  DO NOT MERGE Check "hardware_id" Property