diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-06-01 15:42:40 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 15:42:42 +0000 |
| commit | 99bcc3eee23ed8bd15bd108d068d6f9f694e4393 (patch) | |
| tree | 7264c5e939601112f2fc17ca02aea96e4bbe1d1d /tools | |
| parent | c4e5ec3f7fcc99de6aa070d463bfaeedbfd86802 (diff) | |
| parent | 2217f61e51ba4b19c56b19297c1e9cf74d7d860f (diff) | |
| download | frameworks_base-99bcc3eee23ed8bd15bd108d068d6f9f694e4393.zip frameworks_base-99bcc3eee23ed8bd15bd108d068d6f9f694e4393.tar.gz frameworks_base-99bcc3eee23ed8bd15bd108d068d6f9f694e4393.tar.bz2 | |
Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev
Diffstat (limited to 'tools')
| -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 66092fc..771c3c8 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, boolean b, - Configuration configuration) throws RemoteException { + public void resized(Rect rect, Rect rect2, Rect rect3, Rect rect4, Rect rect5, Rect rect6, + boolean b, Configuration configuration) throws RemoteException { // pass for now. } |