am a6c51f3d: am 7b8b6618: Merge "Fix for battery temperature display"

* commit 'a6c51f3d0b1b43aa3e27bd98639f0ad3acf22ecc':
  Fix for battery temperature display

src/com/android/settings/BatteryInfo.java

@@ -63,11 +63,12 @@ public class BatteryInfo extends Activity {
 
     /**
      * Format a number of tenths-units as a decimal string without using a
-     * conversion to float.  E.g. 347 -> "34.7"
+     * conversion to float.  E.g. 347 -> "34.7", -99 -> "-9.9"
      */
     private final String tenthsToFixedString(int x) {
         int tens = x / 10;
-        return Integer.toString(tens) + "." + (x - 10 * tens);
+        // use Math.abs to avoid "-9.-9" about -99
+        return Integer.toString(tens) + "." + Math.abs(x - 10 * tens);
     }
 
    /**