tree 346ca7140d4c9032b3235cc09883e2a0f31b5e91
parent f9ed095d067d69ce31f249b497bfbed12e6c4dd2
parent 9e8a6e47a79c81f1c579c5f1558d5a5eaa9b6cae
author Xin Li <delphij@google.com> 1599795222 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795222 +0000

[automerger skipped] Merge Android R am: dcb54d425a -s ours am: 3563b4b56b -s ours am: 9e8a6e47a7 -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: Ic3d96fff699ce30d71c98945f88fa3cc4cfbfbf8