OSDN Git Service

Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix
authorDan Morrill <morrildl@google.com>
Mon, 18 Oct 2010 22:23:16 +0000 (15:23 -0700)
committerDan Morrill <morrildl@google.com>
Mon, 18 Oct 2010 22:23:16 +0000 (15:23 -0700)
commit45e30006664ecbf527c72b859f71e30c83cee04b
tree554d22faf16ec617ff207e07c9d118d31a212121
parent5565b9ee032d39cbecfd957bc3baf20d1b4e7954
parent593a7049f52d46a4e47162e2e3f2c5730e8ccfd8
Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix

Conflicts:
res/values/strings.xml
src/com/android/settings/deviceinfo/Memory.java

Change-Id: Id481ad234f2e74bdef66ea9485a548f11f0cab84
res/values/strings.xml
res/xml/device_info_memory.xml
src/com/android/settings/deviceinfo/Memory.java