am 18f196a1: (-s ours) am 9e1266da: Merge "(do not merge)hide videochat changes in gingerbread. bug:3001483" into gingerbread

Merge commit '18f196a19eb93c8b309c8a3e2093ce4400708348'

* commit '18f196a19eb93c8b309c8a3e2093ce4400708348':
  (do not merge)hide videochat changes in gingerbread. bug:3001483
tree: f92fd8706fefdc57e45eb5eae96380d8ee41afc5
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE