am ce63c639: Merge "DO NOT MERGE." into eclair

Merge commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp

* commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0':
  DO NOT MERGE.
tree: 02e006c44a49085c3359169c33b2dcaed4d96203
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE