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