Christine Franks fd8b8eb0b1 Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev

2017-07-21 23:59:23 +00:00

..

android

Merge "Default setup wizard to use PIN"

2017-05-18 08:43:24 +00:00

com/android

Merge "Move logic for FR in demo mode out of Settings" into oc-mr1-dev

2017-07-21 23:59:23 +00:00