Ken Wakasa 6d5b8951b1 Merge commit '47ad0cf3' into manualmerge ...

Conflicts:
	res/xml/language_settings.xml
	src/com/android/settings/LanguageSettings.java

Change-Id: I0dbfd4ee51682e2b55cad0af1caa90bbedd598a2

2010-09-30 11:54:31 +09:00

..

arrays.xml

Import revised translations.

2010-09-24 12:28:13 -07:00

strings.xml

Merge commit '47ad0cf3' into manualmerge

2010-09-30 11:54:31 +09:00