tree 712d0e4eb4769267e4654ad7156bc2014f08699e
parent c467126e7d86626bef03f660a8193b326c5a8745
parent 47740f2c26aea1b3b7830abdcba063a12a61d009
author Android Chromium Automerger <chromium-automerger@android> 1411576785 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1411576785 +0000

Merge third_party/libjingle/source/talk from https://chromium.googlesource.com/external/webrtc/trunk/talk.git at 47740f2c26aea1b3b7830abdcba063a12a61d009

This commit was generated by merge_from_chromium.py.

Change-Id: I716b47abf872803a836ee46221e5d100dfbc3984