Merge "Fix truncated text in pattern lock setup" into nyc-dev am: 353cdee69e
am: 96aaeafa91
am: 3a31510fcd
* commit '3a31510fcd0b1ad37a29a8495f1cb98a969cc658':
Change-Id: I3f735d8fa63b7e54153339f46215d8ca477ed43f
This commit is contained in: