tree a728937ab2b6faff2b3965d38bacd2318264d11e
parent 5e2f1fca9d1a82adeb66dae5df0177b3458e6db0
parent 248e14c9a8cd2bcaf7664db8cdb0a62a9166bfd3
author Xin Li <delphij@google.com> 1602214061 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602214061 +0000

[automerger skipped] Skip ab/6749736 in stage. am: 87fbe1203c -s ours am: 248e14c9a8 -s ours

am skip reason: Change-Id Ic29b1ffb323ad0044a27a98ba1aa08d4935a3bdc with SHA-1 183cfdc021 is in history

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

Change-Id: I4fce5ec913cf2e58250b460c907fc7473c3884d2