Automatic translation import

Change-Id: I174cb4b02fa7fd9730c080d8224b04df53627b50
Settings: Modify AOSP JA translation

Only revision.

Change-Id: Ieaed602f879acaa54dc77fe501b3cef8b72ef2ce
Merge remote-tracking branch 'upstream/cm-11.0' into cm-11.0

Conflicts:
	res/values-pl/cm_strings.xml

Change-Id: I2265a3846b4af8b636ea51059a178d8fecdce711