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

Merge commit 'c434bbbb2c8453f581e0b993ecf23949ca7c5f9b' into gingerbread-plus-aosp

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