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