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