tree 346ca7140d4c9032b3235cc09883e2a0f31b5e91
parent 79b81a5ca689f7566de0561b9d71e325b8c13955
parent ac19e85a49647cb400a623089ad28ca8ca5e8753
author Xin Li <delphij@google.com> 1599011975 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599011975 +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: f9ed095d06 -s ours am: ac19e85a49 -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: I101208f3cdfc00593c55a3a84a5bba837e2f0332