commit | e3448236fb14b0af473403aedce6c661334da5ae | [log] [tgz] |
---|---|---|
author | Lin Yuan <linyuan@google.com> | Thu Jun 02 22:14:51 2022 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jun 02 22:14:51 2022 +0000 |
tree | 0a100e4837e4b66888c00119ecfd1f4e161f2dae | |
parent | e7943d5edcb846a1ce05f948d48d7f780e4fbaf1 [diff] | |
parent | 15e4092ab1eb4b5f96ae638a65af0fcf316df07e [diff] |
[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: 15e4092ab1 -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: I91133ca3aa5db602109ed9226dbf89f4e5deb6a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>