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