am bd324c9b: Merge change I50a321c9 into eclair

Merge commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694' into eclair-mr2

* commit 'bd324c9bd32a3c86634c1cc1ab8525f46a56b694':
  LocationManagerService: Fix race when removing LocationListener
tree: 16d77dec0083367d176fb64338594a964243d895
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE