app_Settings

Go to file

TreeHugger Robot ba2396eb00 [automerger skipped] Merge "Ensure settings maintains its Bluetooth device inquiry state" into sc-dev am: 524f4979f5 am: 20fdbff55a -s ours am: bdc711bec2 -s ours

am skip reason: Merged-In I4dafb7bf5b410d99cba7e30ee17f966611458db7 with SHA-1 0b365c3e69 is already in history

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

Change-Id: I314193cbfcb57e622db6f6a095c0075ff6a166a0

2021-07-02 23:30:50 +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 "Tweak work contact search strings" into sc-dev am: d76acbd981 am: 8663c86005

2021-07-02 17:41:33 +00:00

src/com/android/settings

Merge "Ensure settings maintains its Bluetooth device inquiry state" am: bec574dca7 am: 3b68dd138c am: aa8275f8d3 am: 970df1c47d