am c2aa0e13: am 12174a7d: Merge "Cancel lockscreen/shade gestures when...
am c2aa0e13: am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev automerge: 8334c666
* commit 'c2aa0e13':
Cancel lockscreen/shade gestures when orientation changes