Android 2.2.1 release 1
Merge "Import revised translations" into froyo