tree 2cef7197ddf1b2ce355c390f217612054c9d9e84
parent c55e14ee6a9f788b3f4967bcd44bcf2eab26f1df
parent 7d974c11e23898cd59838c79751b96c45b09ec4b
author Android Chromium Automerger <chromium-automerger@android> 1415266321 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1415266321 +0000

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

This commit was generated by merge_from_chromium.py.

Change-Id: If28216ffbc16e927cf326c567601f482dd2bf36b