app_Settings

Go to file

Bonian Chen 17a4871845 [automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours

am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e is in history

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

Change-Id: Ifda29d94ccdae085264cf14d4b8064db055b4ea2

2020-08-11 08:37:45 +00:00

libs

…

protos

…

res

Merge "Remove "storage type" preference from Settings" am: d6ac86d602 am: 44c538ccef

2020-07-22 09:07:27 +00:00

src/com/android/settings

Merge "Update language to comply with Android's inclusive language guidance" am: 7df1fb2af1 am: 4d421a47dc

2020-07-29 08:26:22 +00:00

tests