Merge change 22950 into eclair

* changes:
  Change these string constants back to match donut.
tree: 814b5504d93ddee4113e41b7141f56d596c144e1
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE