app_Settings

Go to file

Lin Yuan 30f4088b8b [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: 9eff8f7a8d am: 4daf65ea3b -s ours am: 9d3371ee23 -s ours am: aeab9be2c3 -s ours am: c24add0997 -s ours am: 263c0cfaca -s ours am: 1911d2fbb4 -s ours am: 5e8d47f7c1 -s ours am: 057708d529 -s ours am: 136f32048f -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: I4d92157acf41ec71b2c2452f668c09c0a20c7f96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2022-06-24 05:39:39 +00:00

libs

…

protos

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev

2022-06-21 16:17:20 +00:00

src/com/android/settings

Merge "Well control enrolling icon animation by UX design" into tm-qpr-dev am: 84154328df am: c51deb5ccd

2022-06-24 01:13:51 +00:00

tests