| commit | 8f5c0e4660629546fb651e8bc739677a60ad3302 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Mon Nov 03 14:37:51 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Nov 03 14:37:52 2014 +0000 |
| tree | ddc72c00f6257ba98da7906dd3150ca27b6e9b4f | |
| parent | a7b5d2b3843eeb2fa478a727c01ee2a312fa7bbd [diff] | |
| parent | 78121d9d106f12f2b2bae53d323e89667dbdfeee [diff] |
Merge "Bring screen lock setting back to screen pinning" into lmp-mr1-dev