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

Merge commit '8c2a6b742ef85d4fd32ce5abff21483262bea2b1' into gingerbread

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