| commit | 6e0b305fc03f7bdc8400ebd283b55a057518f040 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@google.com> | Thu Apr 07 15:42:48 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Apr 07 15:42:50 2016 +0000 |
| tree | fd01c30e943ce462b3164215ea103d44aff40b7c | |
| parent | f86f986728b5844a48e2e7bbd4927d2f5500c682 [diff] | |
| parent | 5dab713ff0c28ff264d5b26dd1a97bc37eee2d55 [diff] |
Merge "Delay unlock attempts for managed profiles." into nyc-dev