tree d2d685e841438776f9fcc6dc6d97aff05f226ebc
parent 0615bf5c800136aa6092b1c98418b1100b19ad31
parent e9937f907133c2411ff5350f050b4afd15d84080
author Brian Muramatsu <btmura@android.com> 1284757425 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284757425 -0700

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