am 85f3817b: (-s ours) Merge "DO NOT MERGE Update CTS Version to 2.2_r2" into froyo

Merge commit '85f3817bfa6e17f4f43f2d643237f1ef2f1833be' into froyo

* commit '85f3817bfa6e17f4f43f2d643237f1ef2f1833be':
  DO NOT MERGE Update CTS Version to 2.2_r2