Files
packages_apps_Settings/src/com/android/settings
Dan Morrill 45e3000666 Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix
Conflicts:
	res/values/strings.xml
	src/com/android/settings/deviceinfo/Memory.java

Change-Id: Id481ad234f2e74bdef66ea9485a548f11f0cab84
2010-10-18 15:23:16 -07:00
..
2009-05-14 17:47:02 -07:00
2010-01-06 09:46:17 -08:00
2010-10-08 14:48:15 +09:00
2010-09-15 08:42:29 -07:00
2010-10-06 10:40:44 -07:00
2010-06-05 14:42:00 +02:00