am 68b15b68: Porting change I064698b3 from mr2 to eclair.

Merge commit '68b15b68497e373fe63a13f11e18349a738a7989' into eclair-plus-aosp

* commit '68b15b68497e373fe63a13f11e18349a738a7989':
  Porting change I064698b3 from mr2 to eclair.
tree: cf0af6090d425544d12fee07682f443f5d0859bc
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE