diff options
| author | Xin Li <delphij@google.com> | 2021-02-20 15:53:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-20 15:53:42 +0000 |
| commit | 7f710d0066c776c967baf2ab3c8a0ad00719a96a (patch) | |
| tree | 66ea024e880269f96944ce6d67c0a078b40f0d6a | |
| parent | 39835812cbcc5f6affb815955fa9cf24bf3acb53 (diff) | |
| parent | 63937cec5ce3a78a16deabc783886af01adc4bae (diff) | |
| download | libsrtp2-7f710d0066c776c967baf2ab3c8a0ad00719a96a.tar.gz | |
[automerger skipped] Mark ab/7061308 as merged in stage. am: b054ccfb12 -s ours am: 8ff5a45afa -s ours am: 63937cec5c -s oursandroid-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
am skip reason: Change-Id Ica5b998f99005ac80313f66a2781525398c26de9 with SHA-1 062badd57a is in history
Original change: undetermined
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Iacb27443814f988c31435df4685ad5a320e18961
0 files changed, 0 insertions, 0 deletions