Merge change I0d8f7593 into eclair

* changes:
  Fix issue #2296457: PackageManager.addPackageToPreferred needs to a no-op
tree: 4a038c1a19ee314a433c1629dbbe6f4530fdead3
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE