am 9b64ef13: Merge change 25647 into eclair

Merge commit '9b64ef133c1eb24c8d00aa7e46ec86c544af5fe2' into eclair-plus-aosp

* commit '9b64ef133c1eb24c8d00aa7e46ec86c544af5fe2':
  Some tweaks to the rotary lock widget.