commit d0acf0627aa5f78cbf5bb189c7097546b86abebc
author Deepanshu Gupta <deepanshu@google.com> Sat May 23 01:21:09 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat May 23 01:21:11 2015 +0000
tree 930e4f747c7fff473b70321dfdd83c0444dcc273
parent ed77bc09879784a56c60f215f267adc100213ed2
parent 944a6c937cd3576ecae5c3fdd0dcf265329e6bcf

Merge "Revert "Fix build."" into mnc-dev

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java

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 c92df6d..4289689 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 @@
     @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,
-            Rect rect6, Configuration configuration, Surface surface) throws RemoteException {
+            Configuration configuration, Surface surface) throws RemoteException {
         // pass for now.
         return 0;
     }