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

[automerger skipped] Merge Android R am: dcb54d425a -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: I91d5bded87a7674ce5949a226d158d1923d6acfe