tree fa9d73e196bd1ccc532b850288b00ff9e3fca5a1
parent f85a9afbbb9b91c7712bc6fe5775b57f47e642c6
author henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> 1400704937 +0000
committer henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> 1400704937 +0000

Rebase webrtc/base 6163:6216 (svn diff -r 6163:6216 http://webrtc.googlecode.com/svn/trunk/talk/base, apply diff manually)

BUG=3379
TBR=wu@webrtc.org

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

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