commit | 540d92a7e91aa52f0979eec4c8e324dd7c55efb6 | [log] [tgz] |
---|---|---|
author | Maurice Lam <yukl@google.com> | Tue Jul 11 18:21:43 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Jul 11 18:21:43 2017 +0000 |
tree | 262c07018c4483a700d3dbf50a1ce779b6485d03 | |
parent | 75bcd075f23794e0ef17ed3b8e25d3b449b61c23 [diff] | |
parent | 62c0c3c324aca7eaf78d7d5e0c8a6ae0213e1f80 [diff] |
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev