[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
am: fe302e4867
-s ours
am skip reason: subject contains skip directive Change-Id: I94cea1b92275f86a666fcba6c950bf4b4659531f
This commit is contained in: