am 5191ccb3: am e45c4e42: Merge "Increasing timeout for screenshot chord in...
am 5191ccb3: am e45c4e42: Merge "Increasing timeout for screenshot chord in keyguard. (Bug 6941775)" into jb-mr1-dev
* commit '5191ccb3':
Increasing timeout for screenshot chord in keyguard. (Bug 6941775)