| commit | 71b04e6ac227625060cbe958b3b0cf18aff24853 | [log] [tgz] |
|---|---|---|
| author | Ricky Wai <rickywai@google.com> | Wed May 25 13:36:10 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 13:36:10 2016 +0000 |
| tree | 75800b834d36f37fc479b05369b8b415335a3fce | |
| parent | 7b1ccf87002305a6568da318a8dac11ed5dfd247 [diff] | |
| parent | ba6f173c7c58dccc5c183f8e5ce7eb2dd4663b57 [diff] |
Merge "Do not allow DPM.resetPassword() when child profile exists or user is locked am: 977ade26dd am: fdf928d4b5" into nyc-mr1-dev-plus-aosp am: ba6f173c7c * commit 'ba6f173c7c58dccc5c183f8e5ce7eb2dd4663b57': Change-Id: I4375084e3c25e6c4e5fbfce20e3bf826b076ec81