commit | 6260cf84ed58ff1ee9bb8411709aabcf39506a06 | [log] [tgz] |
---|---|---|
author | Jorge E. Moreira <jemoreira@google.com> | Thu Jul 09 14:40:38 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jul 09 14:40:38 2020 +0000 |
tree | 8c4746cc527f2339c3e5c5ee663a732da3445de7 | |
parent | 376882fb83ab77558f0397115fa1d00b0cc7d48b [diff] | |
parent | b0cb21e8d969b7e78096d79b116ddd9c6d497e6e [diff] |
Merge upstream-master am: b0cb21e8d9 Original change: https://android-review.googlesource.com/c/platform/external/usrsctp/+/1353828 Change-Id: I7d0fb3a435a807cd1783c6085749196dd65b1989