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

Browse Source

am: ba6f173c7c

* commit 'ba6f173c7c58dccc5c183f8e5ce7eb2dd4663b57':

Change-Id: I4375084e3c25e6c4e5fbfce20e3bf826b076ec81

...

This commit is contained in:

Ricky Wai

2016-05-25 13:36:10 +00:00

committed by android-build-merger

parent 7b1ccf8700 ba6f173c7c

commit 71b04e6ac2

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available