| commit | 5817a9d6f3311ce2fa1e2ad9e26981eb3d95ee12 | [log] [tgz] |
|---|---|---|
| author | Sudheer Shanka <sudheersai@google.com> | Wed Jul 13 23:23:58 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jul 13 23:23:58 2016 +0000 |
| tree | 596bf0b02a7869381127b473cd24e2c60fa47fd1 | |
| parent | f35a54f9ffca5497c1edcccf1f005918535cdb88 [diff] | |
| parent | cacf91e466584f1ff3b59b95f9a7e18d822243e5 [diff] |
Merge \"Merge \\"Fix disabling lockscreen for demo users.\\" into nyc-mr1-dev am: 55c7c9c2d4\" into nyc-mr1-dev-plus-aosp am: cacf91e466 Change-Id: I9f3a9dcfdf89343446b9dd2a63ec256459fbf9f7