tree 6c118bfb26c66834f259b0f9d7b93aa4d27db0cf
parent 986ec651383fca96f286ac77899e03325bb60662
parent 098fd136f55bd4d55a21f5e12b27d7c31f9adb3a
author Xin Li <delphij@google.com> 1598556342 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598556342 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 850741d2cb -s ours am: b675417913 -s ours am: 098fd136f5 -s ours

am skip reason: Change-Id I890e1b9395ebe8f17d5739fb3169f9a9b80282b0 with SHA-1 948e8c1a66 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/ril/+/12469984

Change-Id: I8705cc2caa1687995d11f7838d090c850733af22