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
tree: d499806e7309557bb2471c2214c1a67f965e8625
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE