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