tree d25815628fb87bbdfc08a8f39e42cf7c284cc7c3
parent 8641a11429179f754b9a6665f90fb1bb767839c9
parent 63265a9edd1b19bc9bb1bea1a0aebc77166f026d
author Xin Li <delphij@google.com> 1598554463 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598554463 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f73f651cea -s ours am: 63265a9edd -s ours

am skip reason: Change-Id I05c47d4b3a675cf3424565c8d576fca8fe1f95dc with SHA-1 913f3732fa is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/dalvik/+/12469439

Change-Id: Ie213ed4e47cd8f361ce737b9b9a06b15d586483b