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

Skip to content
Commit b5acdacc authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and... 

[automerger skipped] Merge "created FORCE_DEVICE_POLICY_MANAGER_LOG and CLEAR_FREEZE_PERIOD" am: 531fcd63 am: 51a15fab am: cbebf234 -s ours am: cede7257 -s ours

am skip reason: skip tag Change-Id I8a2a49aa45704d8991e9cf3689b5259442fb1db3 with SHA-1 5e7b1214 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1608093

Change-Id: I6051e5b81147ca5af43ddfcf643cfdd1b258c87f
parents 78a8f0d3 cede7257
Hide 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