tree b33232d8621a5853be3219cf4f287bc99f0e0969
parent 75778049ba1b51afcdbc9961e176295faee4c5db
parent d189ac52a4e49291b729d817fc903116abc086d0
author Maurice Lam <yukl@google.com> 1466114420 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1466114420 +0000

Merge "Use GLIF theme for Settings > Security > Screen lock" into nyc-mr1-dev