app_Settings

Go to file

Xin Li 0313c67921 [automerger skipped] Merge "Merge sc-dev-plus-aosp-without-vendor@7634622" into stage-aosp-master am: 7d646a5182 -s ours am: c1853be4d0 -s ours

am skip reason: Merged-In Id2a8c43f9bca79200f837759ce9de0a6eba2a37a with SHA-1 26d1877a7b is already in history

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

Change-Id: I1456d89f8a7d4bbc347715fbf9ac8150db07e075

2021-08-17 19:46:34 +00:00

libs

…

protos

[LSC] Add LOCAL_LICENSE_KINDS to packages/apps/Settings

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

res

Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-dev-plus-aosp am: 2b318b3b69

2021-08-17 01:01:47 +00:00

src/com/android/settings

Merge "Update OWNERS." am: 0544dc7b92 am: b294717b4c am: 78ed3bb6ee

2021-08-17 04:41:07 +00:00