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