tree cb46543931df7392395bbedb401a5f4c7098629c
parent 6eee64fc7667ced3cfc691512c6b1d4c3bba32ee
parent 062badd57aeb02b0b32ce2983fa21db42720e31f
author Xin Li <delphij@google.com> 1606178355 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606178355 +0000

Mark ab/6881855 as merged am: 835b8620c7 am: 062badd57a

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

Change-Id: Ia140f40277467909107d828d71fa65369254f000