tree 08eb5dccbb8efdcb49ded81ea2ebe0dfc2335fa0
parent c7bfbec325e97bc40a46257fd89f2fb746ac5091
parent 8c2a6b742ef85d4fd32ce5abff21483262bea2b1
author Brian Muramatsu <btmura@android.com> 1284757743 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284757743 -0700

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