tree 25b30fbecefc2276a793eb53f184f3c5d5ff7946
parent 538e005d0c178b7c9a513bb3350ab641feeb2609
parent 0f2d2e41737a7cbbebe22ad7cc20f536fe919ff4
author Xin Li <delphij@google.com> 1599859642 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599859642 +0000

[automerger skipped] Merge "Merge Android R" am: fd2dce08ef -s ours am: 2b8038f348 -s ours am: 50994486d5 -s ours am: c32db0ee81 -s ours am: 0f2d2e4173 -s ours

am skip reason: Change-Id Ieb1e215ffec643fcbb95c11873f0de07ebeb450b with SHA-1 d85bcd50c6 is in history

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

Change-Id: Id2121354c866d23581c17cede5b75924433d269d