am a1ab9766: Merge "DO NOT MERGE" into eclair

Merge commit 'a1ab9766718e11cb31bd5e87cda2a2bac03573db' into eclair-plus-aosp

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