OSDN Git Service

Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
authorTreeHugger Robot <treehugger-gerrit@google.com>
Thu, 6 Jul 2017 22:08:51 +0000 (22:08 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 6 Jul 2017 22:08:51 +0000 (22:08 +0000)
commit8218511fb7f15a540e82343cd7a2b26e11bd3855
tree98d9045672d9229f3d8a372f6edec54777dce60f
parent55ad60d1ffcd6a54efa179d0cdc1b16f89b988d4
parent562e539516914435bf316e1a8aaa3572dcebfed9
Merge "Hide skip button when setting backup lock screen" into oc-dr1-dev
src/com/android/settings/password/ChooseLockPassword.java
src/com/android/settings/password/SetupChooseLockPassword.java