am 311f9493: (-s ours) am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.

* commit '311f9493dfa88d455ff0ea25f86e508a6852682d':
  Merge 2402ad60 from honeycomb-mr1. do not merge.
tree: f131f449d1316816f9fb2411882e310e1c6f955d
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE