tree 6bbb85006df6b5758c9a6d6777f198dfb1b358c0
parent 31c22f04887fcc68346df71b98322e52c686eee6
parent 094acbb0693b24f52871faabfbb8bdd3f2702f43
author Xin Li <delphij@google.com> 1633683588 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683588 +0000

[automerger skipped] Merge Android 12 am: 39270692b0 -s ours am: b6cf3b30b3 -s ours am: ccdaad1b22 -s ours am: 850ea88719 -s ours am: 094acbb069 -s ours

am skip reason: Merged-In I68b35848a5369cb2ef0186cbe87594318304ff74 with SHA-1 a1fc3d6428 is already in history

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

Change-Id: I78ecb9770fb35a8faed69879a4ded69a225dc202