am 67f09cd0: (-s ours) am d6ce6791: Merge "Cherrypick d1ed33c4 from hc-mr1. do not merge." into gingerbread

* commit '67f09cd090adae6365ca36546b0a517e51255876':
  Cherrypick d1ed33c4 from hc-mr1. do not merge.
tree: aa30a4379194cdb17d0ba95405b471499b23bcb2
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE