tree b817e0bb0bb26599e21e792b14b6a53e9d0df335
parent c9b192a354291895ab4f189d63b3f8aecc48eeaf
parent 98284c8600c73812ff4716a6ea157d1e11d417dc
author Android Chromium Automerger <chromium-automerger@android> 1411429457 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1411429457 +0000

Merge third_party/libsrtp from https://chromium.googlesource.com/chromium/deps/libsrtp.git at 98284c8600c73812ff4716a6ea157d1e11d417dc

This commit was generated by merge_from_chromium.py.

Change-Id: I8b474cb15707650e0e2ab4ea5afd07917f18f292