am dd251cab: Merge "Fix build." into jb-dev

* commit 'dd251cab5b6e5b590cc0aeae8be8f885a7794e72': Fix build.
2012-06-04 11:09:00 -07:00
parent 5bf8f01be1 dd251cab5b
commit fcd738240a
1 changed files with 2 additions and 2 deletions
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java
@@ -226,8 +226,8 @@ public class BridgeWindowManager implements IWindowManager {
    }

    @Override
-    public void overridePendingAppTransition(String arg0, int arg1, int arg2)
-            throws RemoteException {
+    public void overridePendingAppTransition(String arg0, int arg1, int arg2,
+            IRemoteCallback startedCallback) throws RemoteException {
        // TODO Auto-generated method stub

    }