tree eb6643f03afe3a0e3e0cbeb713cd5ad950522def
parent fdd9cd36f2e19c3ec7fe19a0f0b5582bc09a0608
parent 3c2880e32396e466ceeb60df1f28f5ddefd4758e
author Xin Li <delphij@google.com> 1598556341 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598556341 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: d84b0b837a -s ours am: f56c2fabf7 -s ours am: 3c2880e323 -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: I19d2499b8524afcd62b01de9f316ae90e7fc65c0