34fe0153b90c3e616a0fd5aba8aa8118ae600760

This change was originally landed as r5954, but had to be reverted in r5955 due to bots failing. The failures should be fixed in r5956, so the original change is now relanded. BUG=2996 TBR=henrika@webrtc.org Review URL: https://webrtc-codereview.appspot.com/12339004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5958 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%