tree 5c0266978d9775f1fb2b0e8b81cf62bafdd393b2
parent 6c2b7b2432cb42cbef1b32d9ea21b3e9f33b0cda
author sprang@webrtc.org <sprang@webrtc.org> 1410773917 +0000
committer sprang@webrtc.org <sprang@webrtc.org> 1410773917 +0000

Merge r7096 onto branch 38.

BUG=chrome:410456
R=mflodman@webrtc.org, pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/26479004

git-svn-id: http://webrtc.googlecode.com/svn/branches/38/webrtc@7177 4adac7df-926f-26a2-2b94-8c16560cd09d