tree ada59b8b8ff7779663a0652ade3fa6c50767b32b
parent f738810247b887082dbf4ca3a867f8d9e1955001
parent 37fde0aca01fcfcd8483df70a4e82f622e15fda2
author Jean-Michel Trivi <jmtrivi@google.com> 1337909257 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337909257 -0700

Merge "Unhide KeyguardManager locked and secure state getters" into jb-dev