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

..

Memory.java

Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix

2010-10-18 15:23:16 -07:00

Status.java

Fix 2520977: NPE in com.android.settings.deviceinfo.Status

2010-03-17 23:03:45 -07:00