Updated stable to r2699.

git-svn-id: http://webrtc.googlecode.com/svn/stable/src@2700 4adac7df-926f-26a2-2b94-8c16560cd09d
8 files changed