tree 89d5f23aae49598cab978ccb784604fdccb90526
parent 524321421920f031158210af68b238db190b6fcb
parent dfd687bb8ef6224a1e3c38a7de9e79e854b142ad
author Android Chromium Automerger <chromium-automerger@android> 1412713142 +0000
committer Android Chromium Automerger <chromium-automerger@android> 1412713142 +0000

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

This commit was generated by merge_from_chromium.py.

Change-Id: If72e0e4ae1dc864d34a51f51cbd44a9c56c57b1f