tree 82e81aaa275add0a3496909a3f7fe16abc5a95a1
parent 4224d5ed194aa3a3c70ede8a3830b9782c62584c
parent c413f7078d2a69badcb4a2326a4a3d55c25da020
author TreeHugger Robot <treehugger-gerrit@google.com> 1476391837 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1476391841 +0000

Merge "Switch UM to internal isUserUnlockingOrUnlocked"