Android 4.0.4 release 2.1
Import translations. DO NOT MERGE

Change-Id: If6ba19977c5d84197f1d6559d02b9e433ca5fa2b
2 files changed