app_Settings

Go to file

Bill Yi 1b281028c2 [automerger skipped] Merge "Merge SP1A.211105.004 to aosp-master - DO NOT MERGE" am: 9d0eba50aa -s ours am: eda6485a4b -s ours am: 56abf6d05d -s ours

am skip reason: Merged-In I62be3678022753eaba32209c33f95edf220294f1 with SHA-1 a4197a7aa1 is already in history

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

Change-Id: Ifeae8b849e50c7a6874032bd5255e56c2f566e0b

2021-11-03 18:46:14 +00:00

libs

Update proto for contextual_card_list.

2018-11-06 15:48:03 -08:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

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

2021-10-27 01:50:53 +00:00

src/com/android/settings

Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c