diff options
| author | Dianne Hackborn <hackbod@google.com> | 2015-05-22 16:34:44 -0700 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2015-05-22 16:34:44 -0700 |
| commit | 4bb6b751fbbb218e8a298db4aa008472a0aa8d31 (patch) | |
| tree | ba7bccf0a758da93655db357c6fe5a8f60f8e90b /tools/layoutlib/bridge | |
| parent | 4cb03fa059d0145e81e624fddc4b57cb471bd786 (diff) | |
| download | frameworks_base-4bb6b751fbbb218e8a298db4aa008472a0aa8d31.zip frameworks_base-4bb6b751fbbb218e8a298db4aa008472a0aa8d31.tar.gz frameworks_base-4bb6b751fbbb218e8a298db4aa008472a0aa8d31.tar.bz2 | |
Revert "resolved conflicts for merge of 47249f2a to mnc-dev"
This reverts commit c7becb7ee78881646251ff4846e63eb6b96bf7ec, reversing
changes made to 8562b08f04c1309cf40db1e749d612b6824f1d12.
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. } |