tree 346ca7140d4c9032b3235cc09883e2a0f31b5e91
parent ac19e85a49647cb400a623089ad28ca8ca5e8753
parent 1d2afd32988530167d2233b6a67b11ec7abc716d
author Xin Li <delphij@google.com> 1599796753 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796753 +0000

[automerger skipped] Merge Android R am: dcb54d425a -s ours am: 3563b4b56b -s ours am: 9e8a6e47a7 -s ours am: 1d2afd3298 -s ours

am skip reason: Change-Id Ic43dc2b316898ebb8e5505ce0c2d2908abad5fd2 with SHA-1 f609e272ee is in history

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

Change-Id: I0f6811bf701fb82894208dd9df1d7dd02cbde84e