Commit Graph

128951 Commits

Author SHA1 Message Date
Bill Yi
8227b3f13d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 6f9dae1c63 -s ours am: 553e0f65e2 -s ours am: 9ee59b6702 -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: I722e7a394b36b17f8812a262d981e853bba78eb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:06:12 +00:00
Bill Yi
c223507bf7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: c02f810e09 -s ours am: 4c53bc8ff3 -s ours am: e6acd2dc6d -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: Iae5c83a6953c3479929877c27c42785a5c275568
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:05:53 +00:00
Bill Yi
1f6f50270f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: 425f03d8c2 -s ours am: 65a298a7ab -s ours am: 2e58ab4ac2 -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: If477bfaabd437b66f52bacbe5bfa7103d9aa3b76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:02:16 +00:00
Bill Yi
22528ba2b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 0ff2acd74e -s ours am: 008c248017 -s ours am: 66d7b39f2e -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: I9eea87de9c328dc561baec4bed4ba8872758b76c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:01:53 +00:00
Bill Yi
7653b5c5b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: 851cd09273 -s ours am: 59470b027c -s ours am: c8316d8371 -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: I70c987697cc53cfe60ede8f3f0d1e59eb2f93e00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:01:46 +00:00
Bill Yi
dce33ce214 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: 90323d459e -s ours am: 9abc6dfab9 -s ours am: 3fcb054944 -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: I517c1699acb7c36fd6754b90c8512a60ce31959a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:01:22 +00:00
Bill Yi
82909b2377 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 6f9dae1c63 -s ours am: e04ac53021 -s ours am: 0629a1df0f -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: I1f7ca07a88bd70e488f71fe601a1cdd611a159c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:00:59 +00:00
Bill Yi
6f52f43418 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: c02f810e09 -s ours am: 1eac4d3913 -s ours am: 76794bcf9e -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: I4694a6d6c2e3b4824a1848ff2db7beb7c0539396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 17:00:39 +00:00
Bill Yi
5e1aba4064 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 29ffda8638 -s ours am: 99891d9846 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8def0d1e24984f25b1d06b5482caa811ecc0127d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:58:21 +00:00
Bill Yi
9271440659 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 803df51b41 -s ours am: 1992683102 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic02e0345d046eebceea4eac5b69ff67acb17a030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:58:20 +00:00
Bill Yi
5ba254e9fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: d17812db69 -s ours am: 3d96b555c9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib50016f6ae09f8a7cb15954902643a36d4f051c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:58:13 +00:00
Bill Yi
cfb043164e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f1ab0d85e5 -s ours am: 47d9ede73c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib12b77032edac782104ad265fe9ff95f8e40aed8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:57:53 +00:00
Bill Yi
2c97864c32 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 0ab89bcac1 -s ours am: 72ede8d37d -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: Iab4b532d033901c4fb3ae5d58dd571c887eb5728
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 16:57:29 +00:00
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
Chaohui Wang
ce56dcc30b Fix crash of PictureInPicture
This follows change I3115cf1b99a305efef192a0dcf3e809eb7903d0a

PackageManager.getPackageInfoAsUser() will throw exceptions when the
package is too large which is a known issue to PackageManager but very
low priority given resourcing constraints. As per the PackageManager
team suggestion, catch the exception on the app side to alleviate the
impact to the PictureInPicture & App info page.

Fix: 283076353
Fix: 283354211
Test: Unit test
Change-Id: Iad2bf9fbfca6ee7f604fec1c4afa1b9382f6ec7e
2023-05-24 19:41:20 +08:00
SongFerng Wang
da3456772d Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 535a91afff am: 40a0d96640
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: I4661ab9a0358fb4cf6707166f1353790ee5052f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 11:39:23 +00:00
SongFerng Wang
9f7ec71ed6 Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 535a91afff am: 19b516807e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: I8fce026fee3abfef29de73673946690ecf822979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 11:13:49 +00:00
Treehugger Robot
821ab78c7c Merge "Owners updates" am: b2b16851ef am: 340fde1f0f am: b41ce7e248 am: 3b3b66ec0e am: c7d954bff8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706

Change-Id: Ic5baeadb3e328e3fcbadc7a7a06afd2d6cb31cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 11:13:28 +00:00
SongFerng Wang
0d3213f78d Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: 75dd8a0a91 am: 29c01f1357
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

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

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

Change-Id: I2d0a079035df588cce647a713416f04895bc6b32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:53:19 +00:00
Treehugger Robot
c7d954bff8 Merge "Owners updates" am: b2b16851ef am: 340fde1f0f am: b41ce7e248 am: 3b3b66ec0e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706

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

Change-Id: I00756b8f15758d3c6217114036cf14d9d1eaf3d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:36:00 +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
SongFerng Wang
535a91afff 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: I5480462b9262f5d8ee51f23a97d3bde7ab39082c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:14:58 +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
Treehugger Robot
3b3b66ec0e Merge "Owners updates" am: b2b16851ef am: 340fde1f0f am: b41ce7e248
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2601706

Change-Id: I00aee9c7ef4a66a50f7f02dfdf0f466ff41b4f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:14:18 +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
75dd8a0a91 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: I1f0f8264b33b5b826d54da4adca8c2c4409af79b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-24 10:10:09 +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