diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-06-01 16:07:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 16:07:48 +0000 |
| commit | 8825de1751b4362d3a6fce2e402c51e481bb2729 (patch) | |
| tree | cf2837c355b970da23047a8d7a8ea9bf161f9a38 /tools | |
| parent | b305410962eba135605c87ed246b2d7051d4e86a (diff) | |
| parent | 919f93265de94156d2cb32b598b5e08aa8da27c3 (diff) | |
| download | frameworks_base-8825de1751b4362d3a6fce2e402c51e481bb2729.zip frameworks_base-8825de1751b4362d3a6fce2e402c51e481bb2729.tar.gz frameworks_base-8825de1751b4362d3a6fce2e402c51e481bb2729.tar.bz2 | |
Merge "Revert "Revert "Fix build.""" into mnc-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 4289689..c92df6d 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; } |