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

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