tree eb6643f03afe3a0e3e0cbeb713cd5ad950522def
parent e2d9a5f2ee93d34f0206a96711fbef79ce33a3c2
parent f56c2fabf77ac02b6ec7a57cf61b2bdb8b59f284
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: d84b0b837a -s ours am: f56c2fabf7 -s ours

am skip reason: Change-Id Ic21a10b33f8e60d36be4181c1b6ce46ec28541a1 with SHA-1 87c040c658 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/tools/xsdc/+/12469233

Change-Id: I5e06f1357f0c0fb4fd58b14c663fb183bdfc97e4