tree 37346613b4004b372d58242c0a71879441db7d7f
parent 39b2a310f7332ff8663c1448a1aa870e41398e05
parent c9a36c9f3b158ab49dc9faa3efe20a1c63101380
author Xin Li <delphij@google.com> 1599796728 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796728 +0000

[automerger skipped] Merge Android R am: 42b2be02df -s ours am: 5e804e3205 -s ours am: 4cddc077d1 -s ours am: c9a36c9f3b -s ours

am skip reason: Change-Id I4c6584a78c1296b9fe65edeafe7aba3f143f3b56 with SHA-1 128d9d29db is in history

Original change: https://android-review.googlesource.com/c/device/linaro/hikey/+/1422301

Change-Id: Ia78b9e0f21814f6b7cecb6d39f27d4bc7db753d6