tree 061cde30e7631cb42d269b27c22f52888f1f98cf
parent 2848609553f69357e05a3c2e68211c8ec79d3bf0
parent 61371371014e152ab2bd6a4af0bc7141172bcb58
author Xin Li <delphij@google.com> 1633679832 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633679832 +0000

[automerger skipped] Merge Android 12 am: 2fe2cb483c -s ours am: dd52d333d7 -s ours am: 6137137101 -s ours

am skip reason: Merged-In Ibf8093550cfde749db7ba78ff1d462e090b920ce with SHA-1 5a7c594526 is already in history

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

Change-Id: I4bc30d54dc7da6e9e1d5fd839d4512336a9eb6b9