tree 6bbb85006df6b5758c9a6d6777f198dfb1b358c0
parent adc142784a2cd01c963de30b95c96e83e673c09e
parent b6cf3b30b3ac4e55950d220a2ba7d36389252aa7
author Xin Li <delphij@google.com> 1633657162 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633657162 +0000

[automerger skipped] Merge Android 12 am: 39270692b0 -s ours am: b6cf3b30b3 -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: Ica9f744096bfee7b52d43e0ae3d4b8ff7ff0c747