tree 381224636b65096edceec1f45956f7da2fa6474c
parent 1cf1b574e19b6a525ce40cbcd761774bae1ffcfa
parent 999bda9bfbdb2368c89c4eaad3cbe475c2fc0a6a
author Xin Li <delphij@google.com> 1596730947 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596730947 +0000

[automerger skipped] Merge QQ3A.200805.001 am: 07183ae1a3 am: b04f7fad1f -s ours am: 999bda9bfb -s ours

am skip reason: Change-Id I9592448b0f053978dd92f7f58cdd71b8089a6cf2 with SHA-1 c06074b67c is in history

Original change: https://android-review.googlesource.com/c/device/google/wahoo/+/1389022

Change-Id: I83de3cd8a4c088ec4e1de572953c5bb338fef99f