app_Settings

Go to file

Bonian Chen 6e8d241cd9 [automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours am: 17a4871845 -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: I16c99ac5fe38cb7391858d02abd4b21539d6d032

2020-08-11 08:57:21 +00:00

libs

…

protos

…

res

Import translations. DO NOT MERGE ANYWHERE

2020-08-08 15:32:24 +00:00

src/com/android/settings

Merge "Manual selection item's data icon is wrong" into rvc-d1-dev am: ddc238c15e

2020-08-10 07:09:03 +00:00

tests