tree 3c7d78d81b4c69cae88708e072ba9eee0bec0257
parent 4a7f10204c64726a266cb4f3e18529f5656e50a8
parent f97800413f157c911aefbf5be167dbd4806a2323
author Torne (Richard Coles) <torne@google.com> 1415752922 +0000
committer Torne (Richard Coles) <torne@google.com> 1415752922 +0000

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

This commit was generated by merge_from_chromium.py.

Change-Id: Ie174f5f2a901346a28e1887ee81dcd22b2fc6dff