tree a728937ab2b6faff2b3965d38bacd2318264d11e
parent 45c6ff13b290a10f7d5cb69f2c738c54f7218fc7
parent 87fbe1203c3a6b6de16319e3bbe4499b029881b0
author Xin Li <delphij@google.com> 1602210676 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1602210676 +0000

[automerger skipped] Skip ab/6749736 in stage. am: 87fbe1203c -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: Id71611769274fb7d7aa5f1416effc7f1c77689a3