Files
app_Settings/res/layout
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
..
2010-06-07 12:33:53 -07:00