app_Settings

Go to file

Treehugger Robot 07f44b2a4a [automerger skipped] Merge "BluetoothPairingRequest: Add null check for action" am: ed7662f6f6 am: 3366290e20 am: 5486a2fdd4 am: 785b480259 -s ours

am skip reason: Change-Id I24668e20accf96c7469c9e1ab589b1383ab59d18 with SHA-1 1805f666e7 is in history

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

Change-Id: I6ad95d0325e6ec8d9ffe58a2ff6083518f5e1b61

2020-07-28 20:08:31 +00:00

libs

…

protos

…

res

Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev

2020-07-24 16:19:51 +00:00

src/com/android/settings

Merge "More inclusive language." am: 4be2b5c2f6 am: ef56fb20c3 am: b2a470166e am: 17c895b94c

2020-07-28 11:25:00 +00:00

tests