am 15d10744: am d379946b: am 7ff9d5e1: am b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
* commit '15d107441c05abc3e847fa0c270f2d6418f984e2':
This commit is contained in: