diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-05-23 01:21:09 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-23 01:21:11 +0000 |
| commit | d0acf0627aa5f78cbf5bb189c7097546b86abebc (patch) | |
| tree | 930e4f747c7fff473b70321dfdd83c0444dcc273 /tools | |
| parent | ed77bc09879784a56c60f215f267adc100213ed2 (diff) | |
| parent | 944a6c937cd3576ecae5c3fdd0dcf265329e6bcf (diff) | |
| download | frameworks_base-d0acf0627aa5f78cbf5bb189c7097546b86abebc.zip frameworks_base-d0acf0627aa5f78cbf5bb189c7097546b86abebc.tar.gz frameworks_base-d0acf0627aa5f78cbf5bb189c7097546b86abebc.tar.bz2 | |
Merge "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 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 @@ 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, - Rect rect6, Configuration configuration, Surface surface) throws RemoteException { + Configuration configuration, Surface surface) throws RemoteException { // pass for now. return 0; } |