Merge \"Update FakeUid with new methods\" into nyc-mr1-dev

am: 30bef0a063

Change-Id: I3d9e4240c8986fad9ee3c3e3340027e127871d0b

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

@@ -274,4 +274,14 @@ public class FakeUid extends Uid {
     public Timer getBluetoothScanTimer() {
         return null;
     }
+
+    @Override
+    public long getWifiRadioApWakeupCount(int which) {
+        return 0;
+    }
+
+    @Override
+    public long getMobileRadioApWakeupCount(int which) {
+        return 0;
+    }
 }