diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-05-21 02:41:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-21 02:41:08 +0000 |
| commit | 037c9caccdc98bfe9d952e797535611c791787aa (patch) | |
| tree | 8e039977812c633bbfe7c2992bb6a999ea75fc97 /tools | |
| parent | cb89ac84c621e047d81873428325dfd747b90a6b (diff) | |
| parent | c1b736a0cdf41ab5863bfe6901e46c95cc396342 (diff) | |
| download | frameworks_base-037c9caccdc98bfe9d952e797535611c791787aa.zip frameworks_base-037c9caccdc98bfe9d952e797535611c791787aa.tar.gz frameworks_base-037c9caccdc98bfe9d952e797535611c791787aa.tar.bz2 | |
Merge "Fix build." into cw-d-mr1-dev
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; } |