Merge "Add method to BatteryStats" into nyc-dev am: 3dbfe1439b

am: c97e14e679

* commit 'c97e14e679b8b5f8b502e205725ec8efaf534bab':
  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;