Merge "Add method to BatteryStats" into nyc-dev

am: 3dbfe1439b

* commit '3dbfe1439b34c8ddac32b153bc7bb0f7ebad4f37':
  Add method to BatteryStats

src/com/android/settings/fuelgauge/FakeUid.java

@@ -186,6 +186,11 @@ public class FakeUid extends Uid {
         return 0;
     }
 
+    @Override
+    public Timer getProcessStateTimer(int state) {
+        return null;
+    }
+
     @Override
     public Timer getVibratorOnTimer() {
         return null;