308d163c715df7b4348a1e00bf2a6761c0adb689

This reverts commit a831dc3a7d10a1fbaa258ee6b1ca6cfc7e91c5ca to unblock rolling into Chromium. BUG=4081 TBR=magjed@webrtc.org Review URL: https://webrtc-codereview.appspot.com/55549004 Cr-Commit-Position: refs/heads/master@{#9354}
Description
No description provided
Languages
C++
88.6%
C
3.3%
Java
3%
Objective-C++
1.9%
Python
1.9%
Other
1%