tree 346ca7140d4c9032b3235cc09883e2a0f31b5e91
parent 1219aab3a118f88033150be5b8d9a44a13c3ce8a
parent 85892917cbff44675361ff8f2676c9f925348b14
author Xin Li <delphij@google.com> 1598996814 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598996814 +0000

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 781db4fc8f -s ours am: 85892917cb -s ours

am skip reason: Change-Id Ia85b6f41af2746d4ba682ab08cdc8b614922d3b6 with SHA-1 df1fdccaaa is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/linaro/dragonboard/+/12469239

Change-Id: Ifd88ac6f0a656e88d7c66ac387fc26299e8bf369