tree 532416c2f3025131e902ab655f3d404945485a6b
parent bcdb45bfe845ef1beeb4fe1b2e69e5768075f8f4
parent 40539b82d5a2c9bcf23d078e997ce0368160f5a3
author Android Chromium Automerger <chromium-automerger@android> 1411647338 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1411647338 +0000

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

This commit was generated by merge_from_chromium.py.

Change-Id: I01a4e13d3b66df627fcc0992da660f11cfe85646