Android 4.0.4 release 2
Import translations. DO NOT MERGE

Change-Id: I3f9408037dd1ad87c8c326badd044f8412ee7c35
2 files changed