tree 703130dd9b051b0f64dd23f4d9c9e2d2a01e70c0
parent 9094398c0586674313e7396bf3c43cf7d96eb50f
parent cfb152c905f787ee203a0ca90d40d33fd17abfa2
author Xin Li <delphij@google.com> 1598559602 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598559602 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 594ab4f027 -s ours am: ea1973d083 -s ours am: 724921c362 -s ours am: cfb152c905 -s ours

am skip reason: Change-Id I670b163eede4bb60c197e2ded9491d45ad4b6541 with SHA-1 2ee513caf0 is in history

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

Change-Id: I0650cba5c862fb1b20d1380068c91b3cda1cd769