6e3968f62a1a42401dd19d9a85b5a48199a3a45d

This merges the changes from r3199. Review URL: https://webrtc-codereview.appspot.com/1078010 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3443 4adac7df-926f-26a2-2b94-8c16560cd09d
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%