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

* commit 'd193916c83015d54466ad998fb9373f15da754a7': Fix build.
2015-07-15 22:26:42 +00:00
parent 0cb1cfdcc3 d193916c83
commit 4a56983fa7
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.
    }