tree d899fb32ececc5e2cfea818701e1392567a4fb92
parent f4ba21c42084d96be491681c61b05672398a3db5
parent 55c7c9c2d4fd9cf3295eb7a4602adf87425b1945
author Sudheer Shanka <sudheersai@google.com> 1468450274 +0000
committer android-build-merger <android-build-merger@google.com> 1468450274 +0000

Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev
am: 55c7c9c2d4

Change-Id: I2b8d701ead03df661a98679cd4ad743b4a964ea1