| commit | c14e0660a74fa96143719edf9da8fd8526a1b163 | [log] [tgz] |
|---|---|---|
| author | Ajay Kumar Nadathur Sreenivasan <ajayns@google.com> | Wed Jun 21 16:44:14 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 21 16:44:14 2017 +0000 |
| tree | 5b06f349c22b364339177727e1f3156dda08b350 | |
| parent | f60c265a11469551e215a00c14d96eaef3b7bf14 [diff] | |
| parent | f5b77d65b469c8d62bcaaaa00d4e4ae12f922c0a [diff] |
Merge "Add missing 'pin' screen lock option" into oc-dr1-dev am: f5b77d65b4 Change-Id: Ife35a27b745d0ea08b2580c3e41c6fdc38f3d1c4