tree 87db8cc24e5421e469d6c586cc51611265f79747
parent 66a629212a4e2c70ae6e201fdbb695a68d17ccdb
parent 56a0dd8345966c03c4e0ec03a12dd791164e5d1a
author Xin Li <delphij@google.com> 1598554978 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598554978 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 34ceafe350 -s ours am: 56a0dd8345 -s ours

am skip reason: Change-Id I97fa36f91901567404967adbb12981434cea9fb3 with SHA-1 8840cb698a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/compile/libbcc/+/12469918

Change-Id: I6b2d5440200eda8b489c7757f22743ec7699e5bc