diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-05-21 02:55:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-21 02:55:33 +0000 |
| commit | 479b1c77ce7b033f7160614f5a0d7305d1268129 (patch) | |
| tree | 591bd1391d3c6afdcc3d12a8aed92d48350aec7d /tools | |
| parent | 47249f2a9e49aa9626369517315eafc6b42fd8e9 (diff) | |
| parent | 037c9caccdc98bfe9d952e797535611c791787aa (diff) | |
| download | frameworks_base-479b1c77ce7b033f7160614f5a0d7305d1268129.zip frameworks_base-479b1c77ce7b033f7160614f5a0d7305d1268129.tar.gz frameworks_base-479b1c77ce7b033f7160614f5a0d7305d1268129.tar.bz2 | |
am 037c9cac: Merge "Fix build." into cw-d-mr1-dev
* commit '037c9caccdc98bfe9d952e797535611c791787aa':
Fix build.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java | 2 |
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 25f7078..8575839 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 @@ -89,7 +89,7 @@ public final class BridgeWindowSession implements IWindowSession { @Override public int relayout(IWindow iWindow, int i, LayoutParams layoutParams, int i2, int i3, int i4, int i5, Rect rect, Rect rect2, Rect rect3, Rect rect4, Rect rect5, - Configuration configuration, Surface surface) throws RemoteException { + Rect rect6, Configuration configuration, Surface surface) throws RemoteException { // pass for now. return 0; } |