app_Settings

Go to file

Xin Li a14cb35bb6 [automerger skipped] Merge "Merge RQ2A.210305.007" am: 6b94f5ac81 -s ours am: 60b92f8e94 -s ours am: 69d7e7f3c4 -s ours am: 6d513a2c67 -s ours

am skip reason: Change-Id I12e20519ac29f802f9983dcf27f313388b33829c with SHA-1 9059706e7b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibffb65710eb5b9d27117a010b8cd51067e0e1372

2021-03-04 00:40:21 +00:00

libs

…

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

2021-02-25 15:05:14 -08:00

res

Merge "Bold text string update" into sc-dev am: 9edf9597e9

2021-03-03 23:30:59 +00:00

src/com/android/settings

Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" into sc-dev am: 1a10ffe990

2021-03-03 23:30:17 +00:00