| commit | 7a963e183d6d63c5875bc1ea6363e2550113cdf5 | [log] [tgz] |
|---|---|---|
| author | Wei Jia <wjia@google.com> | Wed Jul 13 23:31:10 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 13 23:31:10 2016 +0000 |
| tree | 8e58323c346b996033f8950677cc8133a9e337fa | |
| parent | 5817a9d6f3311ce2fa1e2ad9e26981eb3d95ee12 [diff] | |
| parent | 3b098778c6d098116a11f3c1d38485ea93ac6ac7 [diff] |
Merge \\"Fix disabling lockscreen for demo users.\\" into nyc-mr1-dev am: 407fd1ea62 am: 3b098778c6 Change-Id: I66a5393837e3ec0286be28f766a603da844ce6fc