tree 3dfd64958f5b23f457019b55b7da7a7076de5601
parent 284b20538764afe2500be6ba5b1f3a057123ffc9
parent f752202bee88e31ce765483ba2efa6999ae9c9ad
author Adam Cohen <adamcohen@google.com> 1349398869 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1349398869 -0700

Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev