tree 09f63226c3e60c24a670e0899f134d2722fc217c
parent 793f45e9442f232795b0a33a22de234710c06613
parent d5685d4cc67d1fba57b7cb0024fc9065971e5ac1
author Android Chromium Automerger <chromium-automerger@android> 1412209596 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1412209596 +0000

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

This commit was generated by merge_from_chromium.py.

Change-Id: I12fa2c1bcb9e48a54975f5346a7fcebd63ff1d10