Android 2.2 release 1.1
Merge branch 'froyo' into froyo-release