| commit | dd251cab5b6e5b590cc0aeae8be8f885a7794e72 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Mon Jun 04 11:06:16 2012 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 04 11:06:16 2012 -0700 |
| tree | 5cd77a01ecf9d38377dec05b868731d401807b31 | |
| parent | 7a394abb549ecbb9ac510d1b62e60b0ad03438df [diff] | |
| parent | bb47cf66ec72adff895d0e8b94c26f5d438be49a [diff] |
Merge "Fix build." into jb-dev
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java index a4b2125..8ab875f 100644 --- 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 @@ } @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 }