am fb45a2e9: Merge "Fix layoutlib build" into klp-dev

* commit 'fb45a2e9cde403c4bb7ac62195795bcfad4b8da6': Fix layoutlib build
2013-10-03 13:56:39 -07:00
parent a612595733 fb45a2e9cd
commit 70cd68869d
1 changed files with 6 additions and 0 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
@ -44,6 +44,12 @@ public class BridgePowerManager implements IPowerManager {
        // pass for now.
    }

+    @Override
+    public void acquireWakeLockWithUid(IBinder arg0, int arg1, String arg2, String arg2_5, int arg3)
+            throws RemoteException {
+        // pass for now.
+    }
+
    @Override
    public void crash(String arg0) throws RemoteException {
        // pass for now.