| commit | dafec11e698daf054730cfb04db64f3e31a0c9ff | [log] [tgz] |
|---|---|---|
| author | Makoto Onuki <omakoto@google.com> | Tue Feb 16 20:47:09 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 16 20:47:10 2016 +0000 |
| tree | 73932fb9f69e0714c2b1ed47cda5a90b2ec2cd75 | |
| parent | 61def3e43537599204290447d57967a37eef0fa4 [diff] | |
| parent | 1a5ee776ee51ae6fba30c8f3b33e26eb7f9dedc6 [diff] |
Merge "Don't allow deactivating DAs when the user is not unlocked" into nyc-dev