tree b68a4d2dcfe8b1dba84b1e5d34f32f268bbbc72e
parent ac202e42275fd983c526922f378f8233a483ecf1
parent 4a1be0e1746a6e943207571289ad786c6fd09780
author Xin Li <delphij@google.com> 1602472646 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602472646 +0000

[automerger skipped] Skip ab/6749736 in stage. am: 1bc86e5df6 -s ours am: 99a77bc2d3 -s ours am: 4a1be0e174 -s ours

am skip reason: Change-Id I0aa3c2f08da9cd9e9b1e960bccfa072f5f9292ac with SHA-1 e3f099a5e9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/usrsctp/+/12797350

Change-Id: I930d5847e4737f365da923a17a61047ad931ec8d