tree 37346613b4004b372d58242c0a71879441db7d7f
parent 0cc94c1187ab14f6f85b83bc54d8b3be30df5c07
parent 4cddc077d1eef1b1fd3b7663864ef493abea7d90
author Xin Li <delphij@google.com> 1599795198 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599795198 +0000

[automerger skipped] Merge Android R am: 42b2be02df -s ours am: 5e804e3205 -s ours am: 4cddc077d1 -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: I5cfc5eb8ace7adf69e3c45d3c3c192944725184d