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

Commit 97fe9c75 authored by Martin Long's avatar Martin Long Committed by Roman Birg
Browse files

Add Profiles.

Conflicts:
	Android.mk
	core/java/android/app/ContextImpl.java
	core/java/android/app/admin/DevicePolicyManager.java
	core/java/android/app/admin/IDevicePolicyManager.aidl
	core/java/com/android/internal/widget/LockPatternUtils.java
	media/java/android/media/AudioManager.java
	services/core/java/com/android/server/notification/NotificationManagerService.java
	services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
	services/java/com/android/server/SystemServer.java

Change-Id: Id195de6f8c0b1cd08fc0c32b4347c7c97c347bb1
parent 6a889b85
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment