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