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

Commit dd137a85 authored by Svetoslav's avatar Svetoslav
Browse files

resolved conflicts for merge of 6be2f952 to master-lockscreen-dev 

Conflicts:
	core/java/android/view/IWindowManager.aidl
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: Idcbc581294cc52b53eabefd61e5c20cbcea611db
parents 0c5c18a2 6be2f952
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment