| commit | ba6f173c7c58dccc5c183f8e5ce7eb2dd4663b57 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Wed May 25 13:29:18 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed May 25 13:29:19 2016 +0000 |
| tree | 789ac28f63812e7269b3a8923e919cac66bcf2e6 | |
| parent | b5e25925828dd5a23eaa2ea3a4cebcc6652d2762 [diff] | |
| parent | 96c2032090b94de2e7665d59caeae121e4e7f4db [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