| commit | 3b098778c6d098116a11f3c1d38485ea93ac6ac7 | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Wed Jul 13 23:15:03 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 13 23:15:03 2016 +0000 |
| tree | 554e7cf4bf6f3e3d53169d19a63150da7dfc5140 | |
| parent | cacf91e466584f1ff3b59b95f9a7e18d822243e5 [diff] | |
| parent | 407fd1ea6257c01cff3ba4d8883ce6bbc2f76748 [diff] |
Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev am: 407fd1ea62 Change-Id: I5625a9ef9fd35ee0cbf6cad7651f7a39eee8f059