tree 81f66b47a8056465562b416ed872b83a89ec545c
parent 4e3524229b8c0e399d44e9558520c5db36d78f7f
parent c4c5257e691b3897f21fc9822a69f902e7cb6e34
author TreeHugger Robot <treehugger-gerrit@google.com> 1550463007 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1550463007 +0000

Merge "Fix extend unlock logic when locked"