am a1e3586a
: am 67920f06
: am b02771ef
: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
* commit 'a1e3586a96de17f2a23b5e7bb9e7fff65d6ded3b':
This commit is contained in: