Merge "Update battery content descriptions with labels" into nyc-dev
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index b6eedc3..b15794e 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -38,7 +38,9 @@
     }
 
     public void setStorageSize(long size, long total) {
-        setSummary(Formatter.formatFileSize(getContext(), size));
+        setSummary(size == 0
+                ? String.valueOf(0)
+                : Formatter.formatFileSize(getContext(), size));
         if (total == 0) {
             progress = 0;
         } else {