PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,513 Commits 1 Branch 0 Tags
ec4d28ae1c14beb1e197c942e34e41f60badc04c
Commit Graph

128513 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d0a112ff47 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7e27faf3b1 -s ours am: fe6cefd1a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7970760b2e962d8b0394917c4fa473b6c0676305
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 16:57:05 +00:00
SongFerng Wang
a59629fcbb Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 760b01a081 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: Ie7a8209e482bc44b5269dd276bf994f22743f3fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:22:47 +00:00
Jason Hsu
de67a2444c Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: c347441acc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: If2fe3ead55b63429718c5566b7b444fb3cf69b89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:22:02 +00:00
Bill Yi
9dd28a61e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: badeed703c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d1d7d13fdc78c8bc1462cf5e5673e73695fb123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:17:30 +00:00
Bill Yi
e60eb1f5ee [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 9b61f3aac9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2116d9823daa0cf7107f1abfd428d1626263e422
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:17:26 +00:00
Daniel Huang
4b0bef1fbc Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 09296b5cdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: I011d185d14e8412227981cef3030f602bebb4a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:16:26 +00:00
Bill Yi
1eb4caba3b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: 7ffa45e08f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icb7f33ff429933fc6d2f2e9c5876fc9367892b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:15:45 +00:00
Bill Yi
3a14d3485d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: 5b23a264e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2d3a566900faa7d49238d8a9962c64949eed489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:14:27 +00:00
Bill Yi
d6107db260 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 7316a42fd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5e75f940d90f69c5aac3e3316e1cb0b9aa10366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:14:04 +00:00
Bill Yi
78dfaa1063 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: c024f39b78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie082b084f66c793c1c112fed597c7b0af5786214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:13:04 +00:00
Bill Yi
e20343afb9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: ecfc3df071 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46388a49d3fef7d89d3679b14e03ace02ef7b5cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:12:59 +00:00
Bill Yi
6257eacd0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: 0efe096619 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I75b4d73a1ba58d699b5ea5ea70306ac2194acad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:12:55 +00:00
Bill Yi
91cbebd1d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: c7f64a3e99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25e1c200d23012314ea97bff4cbed264b2f2c957
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:12:30 +00:00
Bill Yi
939c15d7e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 4fdb6d6372 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f7beb5054166a5e7a5cd5d068f547abc6884e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:12:08 +00:00
Bill Yi
8fce49505c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: df526aa998 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I371910e08bce87fd7ab8cf669964ec08acfa4adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 10:11:47 +00:00
SongFerng Wang
760b01a081 Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: I74e0a5236d47238d9d6c773e32994f772b922c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:45:05 +00:00
Jason Hsu
c347441acc Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: Iad256f14ee905463324ecd402aa4ac8b324699eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:42:30 +00:00
SongFerng Wang
71a5715e3e Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev 2023-05-24 09:42:17 +00:00
Bill Yi
badeed703c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0861f30b161f325770af76d485b697491f4830e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:41:57 +00:00
Bill Yi
9b61f3aac9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08b3c9380756b03c352bdc21ff21bb46e0812683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:41:54 +00:00
Daniel Huang
09296b5cdd Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: I7eb87a1fba1768eeefa0248d38f87316da3b5231
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:40:22 +00:00
Bill Yi
7ffa45e08f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7fdff98e3427a7c29b65668c0626508818db08f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:39:17 +00:00
Bill Yi
5b23a264e9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdc3db06c5666f7d5dd76567ca788da03c31709c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:37:32 +00:00
Bill Yi
7316a42fd9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36a2552583affaf2e50c49f9491c228de8d84909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:37:11 +00:00
Bill Yi
c024f39b78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7c4d18affd90c4bd2f8403d6ab7d1196144889c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:36:23 +00:00
Bill Yi
ecfc3df071 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib64f3155f9e3d52ace4ea261850c73794795e68a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:36:19 +00:00
Bill Yi
0efe096619 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I33412a8e9b98de986453ef07732f11164eed91ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:36:14 +00:00
Bill Yi
c7f64a3e99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife23832514039436cb0b3db04ca47fcd83c4c47a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:35:48 +00:00
Bill Yi
4fdb6d6372 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibb262569777335c93fe2a704c863085c7c3a56df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:35:25 +00:00
Bill Yi
df526aa998 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23c72f96a83cddd34640971057e68649c6ca2477
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:35:07 +00:00
Jason Hsu
d1d2be574a Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: cdba87523d am: e3b14146cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: If0ec824e7bcc1f49433d7792d675de4403946b71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:29:36 +00:00
Jason Hsu
f722b86318 Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: 8d3885408e am: 1a0508c538 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: I8f82f4c50e09cb5b92cadc5e5f7fdb5ae6c0d8ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 09:28:50 +00:00
Jason Hsu
e3b14146cf Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: cdba87523d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: Ib5cb883e88bc5c06eb4946b4f01e610c764e6c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:52:03 +00:00
Jason Hsu
1a0508c538 Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: 8d3885408e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: I73d4b6241b88b5a4d14024aa79193f13ebcec4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:47:21 +00:00
Jason Hsu
8d3885408e Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: If6543b0d84f5399010b97693e87007aa8b0e1bd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:09:13 +00:00
Jason Hsu
cdba87523d Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: I07ace8e200477511259198b69e740a4e4cfc057c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 08:04:58 +00:00
Jason Hsu
fe00702ab3 Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev 2023-05-24 07:38:09 +00:00
Yi-Ling Chuang
9736f648de Merge "Refactor battery related feature provider" into udc-qpr-dev am: 75af9aa3f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382081

Change-Id: I9359ab804d13a008f5c5863f4b9443998cf7d77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 07:28:08 +00:00
Yi-Ling Chuang
75af9aa3f5 Merge "Refactor battery related feature provider" into udc-qpr-dev 2023-05-24 06:55:17 +00:00
Treehugger Robot
198669855f Merge "Owners updates" am: 21bc49159a am: e638ec642f am: d0af78bc76 am: a0a0b501ce am: 29fce86c74 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: If67d8cc4906b58458bde7fcd2b6c1e8d716a6af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 06:36:08 +00:00
Treehugger Robot
29fce86c74 Merge "Owners updates" am: 21bc49159a am: e638ec642f am: d0af78bc76 am: a0a0b501ce 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I1a2a1b4fc4687d0349761a478f92208b46856b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 06:03:14 +00:00
Treehugger Robot
a0a0b501ce Merge "Owners updates" am: 21bc49159a am: e638ec642f am: d0af78bc76 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I8ca0208b241e08b00e0778d5ec68f8d3a74f04d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 05:18:00 +00:00
SongFerngWang
1872151b4f The BluetoothDevicePreference register the MetadataChanged 
The bluetooth device preference needs to refresh UI after MetadataChanged
Fix: 282877247
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicePreferenceTest

Change-Id: I02cb07a6b255242e4877089ce2f3b7559ce02362
 2023-05-24 04:49:41 +00:00
Bill Yi
00ceb6bd85 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 0714fceee2 -s ours am: c34cee7c73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id828efc3f49f1cb84b4fb21ccfeb787237264ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:37:45 +00:00
Bill Yi
f1a74c3cfd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 7389f5fc2b -s ours am: 965aa2c306 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I466c0b7e25e12075b8aef08a348233ec2b318226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:37:40 +00:00
Bill Yi
226288cf2f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 30884de198 -s ours am: 4b4a28ef4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18b891f502c68741fb7ed01a21bcd2344c412411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:33:00 +00:00
Bill Yi
0b927812f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 79b4a2bfe0 -s ours am: 51482e5650 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If1488f2848db7f381d7ba0fd9a5791cc6c5e1399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:32:58 +00:00
Bill Yi
e90b75b012 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 0714fceee2 -s ours am: 8b8f302554 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia89d873e0c3795a503dc30f57bf57938cc1ab708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:32:27 +00:00
Bill Yi
8ecef370bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 7389f5fc2b -s ours am: 3c5a358987 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcbdf0b9b2d3384cc9c96f824380dd347c0b618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:32:21 +00:00
Treehugger Robot
d0af78bc76 Merge "Owners updates" am: 21bc49159a am: e638ec642f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601705

Change-Id: I5194c7401859dfcae05a1729c9fdc95d118e9683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-24 04:32:15 +00:00