app_Settings

Go to file

Xin Li 1d2519ade1 [automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b am: 4785355302 -s ours

am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history

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

Change-Id: Ic475987a1d6f0435fb4c4c77e28ada1b687878ff

2021-08-04 01:59:46 +00:00

libs

…

protos

…

res

Import translations. DO NOT MERGE ANYWHERE

2021-07-30 12:06:46 +00:00

src/com/android/settings

Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356

2021-08-04 00:07:38 +00:00

tests