am e046555b: am fd324486: am 5cb05eea: Merge "Fix build." into honeycomb-mr2

* commit 'e046555b4d92179327d12d888be967fff5c027ca':
  Fix build.
tree: 83782c70e05463d7dde8924ea545e9c503398211
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE