Android 2.2.1 release 1
Merge branch 'froyo' into froyo-release