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

* commit 'f57b5e6f23b9ec6f98d4af75072b87b09303e62d': Fix build.
2015-07-15 22:56:39 +00:00
parent 6e4997dbfb f57b5e6f23
commit de5cc88306
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.
    }