tree caf1f917f75081c2126d1cd85c299b8dbd4a085f
parent fe951453a79c22d5322a3a9d65619aad9dc1a4a0
parent b944ee3a9a9cbb3d841124014095c63e1d485578
author Xin Li <delphij@google.com> 1598336504 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598336504 +0000

[automerger skipped] Merge QD4A.200805.003. am: f2651b06cd -s ours am: 481877323d -s ours am: b944ee3a9a -s ours

am skip reason: Change-Id I60adea4d9a0d174244b2441ce14093daf5c20efb with SHA-1 7fcd884a21 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm7150/gps/+/12437964

Change-Id: I00849b442181148dddbb9c6dbe9c43f33f334e8e