Merge "Fix truncated text in pattern lock setup" into nyc-dev am: 353cdee69e
-s ours
am: ac97181cbc
* commit 'ac97181cbc2e8b980f8cc9dd6615d38faff61dc7':
Fix truncated text in pattern lock setup
Change-Id: I5e12f0bd4e7353842d681fe306eb2816d4f332cf
This commit is contained in: