tree 346ca7140d4c9032b3235cc09883e2a0f31b5e91
parent 002a2165e5401ccad8d8f5f106da418496ae08c0
parent 781db4fc8fde38582beca7213ca9a1932913a97d
author Xin Li <delphij@google.com> 1598992638 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598992638 +0000

[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 781db4fc8f -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: I760e1aec75943c982e779fcebff4c80ead39b415