am ae0cf6dc: Merge change I50986dd4 into eclair

Merge commit 'ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e' into eclair-plus-aosp

* commit 'ae0cf6dc9eb92282ef92b00ac68bfaca8aad2a1e':
  Make the RegisteredSErvices Cache not allow the registered service for a
tree: d499806e7309557bb2471c2214c1a67f965e8625
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE