tree 25b30fbecefc2276a793eb53f184f3c5d5ff7946
parent c8a83354e518b4cd8e0221d722bd809b027c6f02
parent c32db0ee81fae163ab9720b02c5ec4a3b301e3a5
author Xin Li <delphij@google.com> 1599796733 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599796733 +0000

[automerger skipped] Merge "Merge Android R" am: fd2dce08ef -s ours am: 2b8038f348 -s ours am: 50994486d5 -s ours am: c32db0ee81 -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: I21d436b95942d1e842b37e7a932a71fe0ce48226