am de5cc883: am f57b5e6f: am 4a56983f: am d193916c: Merge "Fix build." into mnc-dev

* commit 'de5cc88306cccdfe998ffafed4830b5db45b2ffd': Fix build.
2015-07-15 23:17:00 +00:00
parent 209c8cedab de5cc88306
commit 4de824e2bb
1 changed files with 1 additions and 1 deletions
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
@@ -137,7 +137,7 @@ public class BridgePowerManager implements IPowerManager {
    }

    @Override
-    public void wakeUp(long time) throws RemoteException {
+    public void wakeUp(long time, String reason, String opPackageName) throws RemoteException {
        // pass for now.
    }