tree bbec82f714724e313014681f1950b9fd370a330f
parent 948f768580d1b39e120dcfd9660110f19ef43f38
author henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> 1403540127 +0000
committer henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> 1403540127 +0000

Rebase webrtc/base with r6521 version of talk/base:
cd webrtc/base
svn diff -r 6466:66521 http://webrtc.googlecode.com/svn/trunk/talk/base >
6521.diff
patch -p0 -i 6521.diff

BUG=3379
TBR=jiayl@webrtc.org

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

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