diff options
| author | Dianne Hackborn <hackbod@google.com> | 2012-06-04 11:09:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-04 11:09:00 -0700 |
| commit | fcd738240a7d716e21721514202caa5bfb2dcb98 (patch) | |
| tree | caaa71a10f3154c2925f0c5b060126f74f1a81bf /tools/layoutlib | |
| parent | 5bf8f01be1cd9800e53b30117fe9ea7fb1153301 (diff) | |
| parent | dd251cab5b6e5b590cc0aeae8be8f885a7794e72 (diff) | |
| download | frameworks_base-fcd738240a7d716e21721514202caa5bfb2dcb98.zip frameworks_base-fcd738240a7d716e21721514202caa5bfb2dcb98.tar.gz frameworks_base-fcd738240a7d716e21721514202caa5bfb2dcb98.tar.bz2 | |
am dd251cab: Merge "Fix build." into jb-dev
* commit 'dd251cab5b6e5b590cc0aeae8be8f885a7794e72':
Fix build.
Diffstat (limited to 'tools/layoutlib')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowManager.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ 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 } |