diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-05-23 00:34:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-23 00:34:35 +0000 |
| commit | dd5ee4b89083ec9b50b8c9739274136b0c74abb5 (patch) | |
| tree | 9b1d3a1842061ee23f76cd14a5864e06e918dd36 /tools/layoutlib/bridge | |
| parent | aefdaa5cbd2a68aa6c8e7d229b897237562cebcb (diff) | |
| parent | 4bb6b751fbbb218e8a298db4aa008472a0aa8d31 (diff) | |
| download | frameworks_base-dd5ee4b89083ec9b50b8c9739274136b0c74abb5.zip frameworks_base-dd5ee4b89083ec9b50b8c9739274136b0c74abb5.tar.gz frameworks_base-dd5ee4b89083ec9b50b8c9739274136b0c74abb5.tar.bz2 | |
Merge "Revert "resolved conflicts for merge of 47249f2a to mnc-dev"" into mnc-dev
Diffstat (limited to 'tools/layoutlib/bridge')
| -rw-r--r-- | tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java index 771c3c8..66092fc 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindow.java @@ -47,8 +47,8 @@ public final class BridgeWindow implements IWindow { } @Override - public void resized(Rect rect, Rect rect2, Rect rect3, Rect rect4, Rect rect5, Rect rect6, - boolean b, Configuration configuration) throws RemoteException { + public void resized(Rect rect, Rect rect2, Rect rect3, Rect rect4, Rect rect5, boolean b, + Configuration configuration) throws RemoteException { // pass for now. } |