am 26d4e539: am 678cdbe5: Fix build.

Merge commit '26d4e539676346236082ed1d3eccdf078980b7d5' into eclair-mr2-plus-aosp

* commit '26d4e539676346236082ed1d3eccdf078980b7d5':
  Fix build.
tree: 6bc857786e44c429f10c5843884526ba7f6ded25
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE