tree bf03a4f23754e0a2b8cbec775376392e63880f9b
parent 705fdbdbba4fa8bdba9d3249cf5e6705f3d60a0a
parent 89d54d71a03961ca66b31189406d2246e755c197
author Xin Li <delphij@google.com> 1591633757 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591633757 +0000

[automerger skipped] Merge QQ3A.200605.002 into master am: 7cc48ad849 -s ours am: ef10dd79e8 -s ours am: 89d54d71a0 -s ours

am skip reason: Change-Id If818e3387646f6fffeef422bafe580543b4d8c57 with SHA-1 a4cc21bf27 is in history

Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sdm845/gps/+/1323621

Change-Id: I566e3e0fcc74b4e5706d804f48dd9cd31467933c