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 '40e72a87126c9b28e7d6af5e2ebc6c8e485f3407' into gingerbread-plus-aosp

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