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