am 81f8cd92: am 3ce79f6c: am 96496e2d: Merge "Build fix after changing IWindowSession." into cw-d-mr1-dev

* commit '81f8cd92fa003a8625df1098662d0afa50f07e89':
  Build fix after changing IWindowSession.
This commit is contained in:
Filip Gruszczynski
2015-07-02 00:36:41 +00:00
committed by Android Git Automerger

View File

@@ -47,7 +47,7 @@ public final class BridgeWindowSession implements IWindowSession {
@Override @Override
public int addToDisplay(IWindow arg0, int seq, LayoutParams arg1, int arg2, int displayId, public int addToDisplay(IWindow arg0, int seq, LayoutParams arg1, int arg2, int displayId,
Rect arg3, Rect arg4, InputChannel outInputchannel) Rect arg3, Rect arg4, Rect arg5, InputChannel outInputchannel)
throws RemoteException { throws RemoteException {
// pass for now. // pass for now.
return 0; return 0;