am 8681df90: DO NOT MERGE

Merge commit '8681df902e8cc61d290808c5d78ea48920d30f3b' into eclair-plus-aosp

* commit '8681df902e8cc61d290808c5d78ea48920d30f3b':
  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