am 79b468dc: Merge "Fix potential deadlock between LockScreen and...
am 79b468dc: Merge "Fix potential deadlock between LockScreen and WindowManagerService" into jb-mr2-dev-plus-aosp
* commit '79b468dc':
Fix potential deadlock between LockScreen and WindowManagerService