tree 025f855d01ddb5e1840177439a1feaa978b8677c
parent f3ae4e178c8e5111f24927bbc43a7d73d03c8501
parent 602ab325ca03b8dd0b3c2d572614c85ce32e309a
author Jeff Brown <jeffbrown@google.com> 1337210721 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1337210721 -0700

Merge "Don't allow shortcuts while keyguard showing." into jb-dev