| commit | ad1b7f611310513b7dac74ffaff929c745126f44 | [log] [tgz] |
|---|---|---|
| author | Clara Bayarri <clarabayarri@google.com> | Mon Mar 21 11:12:20 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Mar 21 11:12:20 2016 +0000 |
| tree | cef50ff29fdf735072b331f298d76127bf42daa8 | |
| parent | 5f96b25dae8092ed5173ae89948515f1c2848f6f [diff] | |
| parent | 26632097ba7ae5d9a4fb3db08be588e686520f55 [diff] |
Merge "User should confirm device lock before un-unifying" into nyc-dev