tree 2d82b6aa926b30042d4d887e178aa31f71d0b5e6
parent 26678826545943a4b682189a30803ead3c5a9a25
parent 05c849c030f90533b1c4c61a86f3e3b5944e4654
author Lin Yuan <linyuan@google.com> 1654207162 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1654207162 +0000

[automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into qt-dev am: d765af048a am: 36069908ce -s ours am: 02ca401236 -s ours am: 686679749b -s ours am: 7d66c0ff97 -s ours am: 05c849c030 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670860

Change-Id: If81fe5de7048b8617149f9d5cb4360ec1aad7f81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>