am f8648cd4: (-s ours) am 40e72a87: am 8c2a6b74: (-s ours) am e9937f90: (-s ours) Merge "DO NOT MERGE Froyo CTS Version Increment to 2.2_r3" into froyo

Merge commit 'f8648cd437d47b0f3c7d404cb87582dba458e6c4'

* commit 'f8648cd437d47b0f3c7d404cb87582dba458e6c4':
  DO NOT MERGE Froyo CTS Version Increment to 2.2_r3