summaryrefslogtreecommitdiffstats
path: root/tools/layoutlib/bridge
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-05-14 19:37:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-14 19:37:24 -0700
commite4b1c08abf88c55e71c0afab4c3c853d96d5d26c (patch)
treeb8de69fe4984e76a96141550d27cb656280ecfac /tools/layoutlib/bridge
parent6917b2a10d9b701282fbfb85be48eeb7e7877882 (diff)
parent095c2d315d3bdf4cdb61439d427413c0bd7796e1 (diff)
downloadframeworks_base-e4b1c08abf88c55e71c0afab4c3c853d96d5d26c.zip
frameworks_base-e4b1c08abf88c55e71c0afab4c3c853d96d5d26c.tar.gz
frameworks_base-e4b1c08abf88c55e71c0afab4c3c853d96d5d26c.tar.bz2
am 095c2d31: am 4286d6d1: Fix build.
* commit '095c2d315d3bdf4cdb61439d427413c0bd7796e1': Fix build.
Diffstat (limited to 'tools/layoutlib/bridge')
-rw-r--r--tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java
index 3996d26..6fb599d 100644
--- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java
+++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java
@@ -69,7 +69,7 @@ public final class BridgeWindowSession implements IWindowSession {
}
@Override
public int relayout(IWindow arg0, int seq, LayoutParams arg1, int arg2, int arg3, int arg4,
- int arg4_5, Rect arg4_6, Rect arg5, Rect arg6, Rect arg7, Configuration arg7b,
+ int arg4_5, Rect arg5, Rect arg6, Rect arg7, Configuration arg7b,
Surface arg8) throws RemoteException {
// pass for now.
return 0;