Files
app_Settings/src/com/android/settings
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
..
2010-09-28 21:26:50 -07:00
2010-09-29 16:09:42 -07:00
2009-05-14 17:47:02 -07:00
2010-01-06 09:46:17 -08:00
2010-09-15 08:42:29 -07:00
2010-09-12 17:43:10 -07:00
2010-06-05 14:42:00 +02:00