tree 08d961cc9832581bdeaf80813f90df7bdc3eb852
parent 5445691975147c56419bed63c1e14127ccec7dd1
parent f8648cd437d47b0f3c7d404cb87582dba458e6c4
author Brian Muramatsu <btmura@android.com> 1284765050 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284765050 -0700

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

Merge commit 'f8648cd437d47b0f3c7d404cb87582dba458e6c4'

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