tree d759d27b3dd309ad77f7ffa3226b228d953ab275
parent 8eae0d428b82b7bef825f8608c14ae56c0ef87a0
parent 4619f14f79ffb7c178645836f51091bb5fdd4e1f
author TreeHugger Robot <treehugger-gerrit@google.com> 1600813827 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1600813827 +0000

[automerger skipped] Merge "DO NOT MERGE Fix bug in getCurrentLocation cancellation" into rvc-qpr-dev am: 0c04c70178 am: 4619f14f79 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12660988

Change-Id: Icdb8be2db454800b397317a69f07940b0e6d5654