Android 2.2 release 1.1
Merge "Import revised translations" into froyo