tree 1583240a78fae486df285a9c0b3a051c38299e70
parent 68a9663223179f447e99b76c6397037f880482e5
parent 190c8cbfcf8fd810aa09e0fab4ca62a8ce724e14
author Android Chromium Automerger <chromium-automerger@android> 1414411769 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1414411769 +0000

Merge third_party/usrsctp/usrsctplib from https://chromium.googlesource.com/external/usrsctplib.git at 190c8cbfcf8fd810aa09e0fab4ca62a8ce724e14

This commit was generated by merge_from_chromium.py.

Change-Id: Ic62703bfc8911760e7a7417cbde0a93d29945582