tree 681ca20c5267d885fddaa72462b580d4b178c79d
parent e90cb7dda7818321f630b484e1e2d19c35436110
parent ba509c8db0b00fdc9143459b0d9fefb2c25a5861
author android-build SharedAccount <android-build@sekiwake.mtv.corp.google.com> 1282286520 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282286520 -0700

am ba509c8d: am c434bbbb: am 817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release

Merge commit 'ba509c8db0b00fdc9143459b0d9fefb2c25a5861'

* commit 'ba509c8db0b00fdc9143459b0d9fefb2c25a5861':
  bump version from 2.2 to 2.2.1 for next froyo release