app_Settings

Go to file

Weng Su affec36497 [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours am: f05b8fbb79 -s ours am: 107ebcdc9e -s ours am: 658383d2e3 -s ours am: 097eef0b83 -s ours

am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

Change-Id: Idc46f490721481625020c9cf995352d60833aa11

2021-10-08 07:50:06 +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 "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev

2021-10-07 08:40:55 +00:00

src/com/android/settings

Merge "Update to new method of getting display power profile constants" into sc-v2-dev am: d754409050