tree cb46543931df7392395bbedb401a5f4c7098629c
parent eb528ef5ce8d3eaee1df86bf9dcf5d81faac5d6a
parent 835b8620c7f98af3dc31d857257e80a12d10c778
author Xin Li <delphij@google.com> 1606176838 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1606176838 +0000

Mark ab/6881855 as merged am: 835b8620c7

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

Change-Id: Ica5b998f99005ac80313f66a2781525398c26de9