diff options
| author | Filip Gruszczynski <gruszczy@google.com> | 2015-05-20 20:11:39 -0700 |
|---|---|---|
| committer | Filip Gruszczynski <gruszczy@google.com> | 2015-05-20 20:15:29 -0700 |
| commit | c7becb7ee78881646251ff4846e63eb6b96bf7ec (patch) | |
| tree | a42141a24ea950f26b21faf95157f8f2513f66d3 /tools | |
| parent | 8562b08f04c1309cf40db1e749d612b6824f1d12 (diff) | |
| parent | 47249f2a9e49aa9626369517315eafc6b42fd8e9 (diff) | |
| download | frameworks_base-c7becb7ee78881646251ff4846e63eb6b96bf7ec.zip frameworks_base-c7becb7ee78881646251ff4846e63eb6b96bf7ec.tar.gz frameworks_base-c7becb7ee78881646251ff4846e63eb6b96bf7ec.tar.bz2 | |
resolved conflicts for merge of 47249f2a to mnc-dev
This is a merge of chin support.
Change-Id: I436b751b3c4aaa6b46cfcdb475e02eedfa5a5635
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. } |