Maurice Lam ace9759446 Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev ...

am: 540d92a7e9

Change-Id: I63b9b138b1918d066a85d19c5f91221acdd3e083

2017-07-11 18:27:30 +00:00

..

android/settings

Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev

2017-07-11 18:27:30 +00:00