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

Merge commit 'e9937f907133c2411ff5350f050b4afd15d84080' into froyo

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