tree 5195212cbbbe98d304c6c5e40bf04248e6ccb7c8
parent 0cd7ea3c5469da003b94ee88a997d0f61f5558b6
parent e3400d6b1c0a47d70efbc80d771495ef8d86986a
author Xin Li <delphij@google.com> 1598998217 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598998217 +0000

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 466f2010e3 -s ours am: 6cf17f1c7d -s ours am: e3400d6b1c -s ours

am skip reason: Change-Id I3b560526b158fe2632c9475d1f1ab44af20263a5 with SHA-1 61c62d46a1 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/prebuilts/abi-dumps/vndk/+/12470316

Change-Id: I3f2089beef2356de0bbe368578caf986dbf05822