Merge change I50a321c9 into eclair

* changes:
  LocationManagerService: Fix race when removing LocationListener
tree: 8413291bc5256c9ede9f57b8ee3790e7135d1d5f
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE