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
This commit is contained in:
Vasu Nori 2010-09-22 10:18:39 -07:00 committed by Android Git Automerger
commit 11d05de2d8

Diff Content Not Available