tree e73981a57a01a559fbe4edaf901216cf6831fc8f
parent 3c9297c3cb739b9aec9ccff7e4e3e05006edb836
parent eec4fe2cbe20174ac3b60f0ca90b51271ea98751
author Adam Powell <adamp@google.com> 1352341905 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1352341906 -0800

Merge "Use stable layouts for keyguard/SlidingChallengeLayout" into jb-mr1-lockscreen-dev