Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29e74621 authored by Jim Miller's avatar Jim Miller Committed by Adam Lesinski
Browse files

resolved conflicts for merge of fb2e3c8d to master 

Change-Id: I159b529adae04a33a965ec0d43fc9a47e82b6417
parent 94fc9124

tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

+0 −5
Original line number Diff line number Diff line
@@ -457,11 +457,6 @@ public class IWindowManagerImpl implements IWindowManager { 
        return false;

    }



    @Override

    public void showAssistant() {



    }



    @Override

    public IBinder getFocusedWindowToken() {

        // TODO Auto-generated method stub