tree 0dcb667344772a7d0ae8bebe6ee35f32f8973b52
parent 8a441b6f100937431b09a59487927382d440d162
parent f63eee9f0ae8b13f12d35b21ef5a111770d318a4
author TreeHugger Robot <treehugger-gerrit@google.com> 1544466009 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1544466009 +0000

Merge "Revert "migrate new setupcompat and setupdesign to SetupChooseLockGeneric""