app_Settings

Go to file

Automerger Merge Worker da6dcaab16 Merge changes from topic "am-0095f4478dec434bb6286b7944b22006" into sc-v2-dev-plus-aosp

* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission" into sc-dev am: d89fa348ed am: d3647e4668 am: f878351899 -s ours
  [automerger skipped] RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: d7c50f7952 am: 4d356edd17 am: 2ac75e8144 -s ours

2021-11-09 07:46:22 +00:00

libs

Update window aar

2021-10-01 10:15:03 -07:00

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Merge "Set a min height for pattern setup." into sc-v2-dev am: 774c2181ea

2021-11-05 03:01:18 +00:00

src/com/android/settings

RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission am: 58d81fbbb4