app_Settings

Go to file

Bill Yi b87ed42698 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: ae5b4b8105 -s ours am: b8112dac09 -s ours am: 9a9e114866 -s ours

am skip reason: subject contains skip directive

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

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

2022-06-13 19:03:28 +00:00

libs

…

protos

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE"

2022-06-13 18:45:27 +00:00

src/com/android/settings

Merge "Use StorageManager.isFileEncrypted() instead of deprecated methods"

2022-06-13 18:41:26 +00:00

tests