am 334d66ed: am 6f562e9f: am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev

* commit '334d66ed41bbeb3456ee1366428076e85c875b7d':
  Show the assist ring on center-button longpress on lockscreen.