Maurice Lam 2dad90da4b Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev ...

am: 0ece5f2a06

Change-Id: Ib00277edf9edc35fbb0c279f1e103c02c0e508fc

2017-08-16 08:04:41 +00:00

..

android/settings

Merge "Don't launch Choose Lock again if recreating" into oc-mr1-dev

2017-08-16 08:04:41 +00:00