am 00a68f4e: am 2ec390d1: Merge "Increase lock screen timeout when on custom...
am 00a68f4e: am 2ec390d1: Merge "Increase lock screen timeout when on custom widget page." into jb-mr1-dev
* commit '00a68f4e':
Increase lock screen timeout when on custom widget page.