tree bc4103cb2c9c604fb74ca73bf22b4eef41e919f6
parent aeeb8f3767eb7f3bd4d058a8a9b39d1a3b2259a8
author guoweis@webrtc.org <guoweis@webrtc.org> 1411160772 +0000
committer guoweis@webrtc.org <guoweis@webrtc.org> 1411160772 +0000

Reapply 23529005 after fixing the build break issue (Chromium:582133002)

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

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