Android 2.2 CTS release 7
Merge "Import revised translations" into froyo