am 48515f49: Merge change I0de7979b into eclair

Merge commit '48515f495b29c01b473579825d5ba5e690ff5db7' into eclair-plus-aosp

* commit '48515f495b29c01b473579825d5ba5e690ff5db7':
  Fix issue #2170897: wallpaper touch-up event not seen when exiting lock screen