app_Settings

Go to file

Xin Li a486aae1f4 [automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours am: 3fd1488575 -s ours

am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history

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

Change-Id: I62c3578d5dd1ce64b95dd1b2e54e648a3f362676

2020-09-11 02:02:47 +00:00

libs

…

protos

…

res

Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53

2020-09-01 04:40:24 +00:00

src/com/android/settings

Merge "Settings: Fix exception in about phone during SIM swap" am: 16503cf517 am: e40251b9f5

2020-08-19 15:08:01 +00:00

tests