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

Skip to content
Commit 71b04e6a authored by Ricky Wai's avatar Ricky Wai Committed by android-build-merger
Browse files

Merge "Do not allow DPM.resetPassword() when child profile exists or user is... 

Merge "Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26 am: fdf928d4" into nyc-mr1-dev-plus-aosp
am: ba6f173c

* commit 'ba6f173c':

Change-Id: I4375084e3c25e6c4e5fbfce20e3bf826b076ec81
parents 7b1ccf87 ba6f173c
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment