Commit Graph

Select branches

Hide Pull Requests

evolution

Mono Color

• 24b045c987 Move DisplayDataSizeTest to AndroidJunitTest Chun-Ku Lin 2023-06-06 22:10:09 +00:00
• 2e04537a79 Snap for 10269577 from b5dda005fd to udc-release Android Build Coastguard Worker 2023-06-06 23:19:56 +00:00
• 71b8076566 Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5 am: e947da08e3 Wenhui Yang 2023-06-06 21:53:16 +00:00
• e898743617 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: ef6f54982a am: 649eecde6a am: 65e9aee62f Ale Nijamkin 2023-06-06 21:52:59 +00:00
• 2052f6f295 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 am: 163c01ab4c am: 42521b3663 Ale Nijamkin 2023-06-06 21:52:50 +00:00
• b861fce560 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 am: dc6449157b am: fd48767844 Ale Nijamkin 2023-06-06 21:52:09 +00:00
• e947da08e3 Merge "Fix face model delete message" into udc-qpr-dev am: 4eceb6c5c5 Wenhui Yang 2023-06-06 21:12:54 +00:00
• 65e9aee62f Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: ef6f54982a am: 649eecde6a Ale Nijamkin 2023-06-06 21:12:51 +00:00
• 42521b3663 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 am: 163c01ab4c Ale Nijamkin 2023-06-06 21:12:23 +00:00
• fd48767844 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 am: dc6449157b Ale Nijamkin 2023-06-06 21:10:27 +00:00
• 4eceb6c5c5 Merge "Fix face model delete message" into udc-qpr-dev Wenhui Yang 2023-06-06 21:09:56 +00:00
• 649eecde6a Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: ef6f54982a Ale Nijamkin 2023-06-06 20:29:51 +00:00
• 163c01ab4c Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 Ale Nijamkin 2023-06-06 20:27:23 +00:00
• dc6449157b Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 1e3ecf6352 Ale Nijamkin 2023-06-06 20:26:05 +00:00
• d31487b529 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd am: 306421f87f Ale Nijamkin 2023-06-06 20:23:19 +00:00
• 1e3ecf6352 Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd Ale Nijamkin 2023-06-06 19:44:29 +00:00
• 5e71aee4cd Fix face model delete message Wenhui Yang 2023-06-05 21:58:09 +00:00
• 306421f87f Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd Ale Nijamkin 2023-06-06 19:44:07 +00:00
• 46f5cbdeec Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd Ale Nijamkin 2023-06-06 19:43:43 +00:00
• ef6f54982a Merge "Fixes nav stack issue." into udc-dev am: b5dda005fd Ale Nijamkin 2023-06-06 19:41:14 +00:00
• b5dda005fd Merge "Fixes nav stack issue." into udc-dev Ale Nijamkin 2023-06-06 18:48:59 +00:00
• ff255c6eda Don't hide approved NLSes in Settings Matías Hernández 2023-06-05 18:24:04 +02:00
• f89435ef11 Merge changes from topic "am-a85daf5f57ad4c94a8e17cfffed8df36" into udc-qpr-dev-plus-aosp am: 4c43d97d86 Automerger Merge Worker 2023-06-06 16:58:19 +00:00
• 01ccedb97c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae -s ours am: 1a02d5733e -s ours am: 3c8b2b65a0 -s ours Treehugger Robot 2023-06-06 16:57:46 +00:00
• 9adfdcd4af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae -s ours am: e0a3e3a8f9 -s ours am: a1898a0218 -s ours Treehugger Robot 2023-06-06 16:49:21 +00:00
• b57dd22f83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1108d7d99 -s ours am: a4dd0da90d -s ours am: f0beeb3c1d -s ours Bill Yi 2023-06-06 16:49:14 +00:00
• 7c52e287eb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8db6cc323c -s ours am: f2d7712bfc -s ours am: 70bb780dce -s ours Treehugger Robot 2023-06-06 16:49:11 +00:00
• d93ecda33a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f346881098 -s ours am: f740db022d -s ours am: 656362603c -s ours Bill Yi 2023-06-06 16:48:50 +00:00
• 7baf165caa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c1fdb0bec2 -s ours am: 4b7663cbf1 -s ours am: ad3219fda4 -s ours Treehugger Robot 2023-06-06 16:48:37 +00:00
• 327393a7f0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16b5dd96c2 -s ours am: 59f5c56e84 -s ours am: 7fc8621dcd -s ours Bill Yi 2023-06-06 16:48:26 +00:00
• 6ba556a347 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: 1dc6b2d265 -s ours am: 28a5ce5fc5 -s ours am: e576574ac9 -s ours Treehugger Robot 2023-06-06 16:44:16 +00:00
• b0723e2829 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: c0e9862110 -s ours am: 524d887d72 -s ours am: cabcc64d06 -s ours Bill Yi 2023-06-06 16:44:13 +00:00
• b5d303d807 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: 1dc6b2d265 -s ours am: 44ccdc1fee -s ours am: 844d8a272e -s ours Treehugger Robot 2023-06-06 16:43:52 +00:00
• 23fec176ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: c0e9862110 -s ours am: e881cb0f82 -s ours am: 572b37da04 -s ours Bill Yi 2023-06-06 16:43:48 +00:00
• 61c118be7e Merge changes from topic "am-ee1e11b48ff64035aa2f6bbc85aea648" into udc-qpr-dev-plus-aosp am: 76b9f31667 Automerger Merge Worker 2023-06-06 16:42:12 +00:00
• cd99a1f467 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: 12ec34641e -s ours am: 7e87dbe180 -s ours am: 178a4c1da3 -s ours Treehugger Robot 2023-06-06 16:41:35 +00:00
• a00c5ab975 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: 12ec34641e -s ours am: 9c6aa99c82 -s ours am: 213cfbba28 -s ours Treehugger Robot 2023-06-06 16:28:32 +00:00
• ecc9d3d1aa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670 -s ours am: fe99021d55 -s ours am: 9180964e49 -s ours am: f3c5b4b5e2 -s ours Bill Yi 2023-06-06 16:28:25 +00:00
• 96366faa9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485 -s ours am: 04f844c712 -s ours am: b61f2fca16 -s ours am: fb9d94f892 -s ours Treehugger Robot 2023-06-06 16:28:20 +00:00
• d376bcf240 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours am: 5e71a3fdf4 -s ours am: 16cb3a2b76 -s ours am: 33f5a5a0b5 -s ours Bill Yi 2023-06-06 16:28:05 +00:00
• abf5d2a3b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours am: f14e96fe88 -s ours am: df93f73e95 -s ours am: 5c864d3727 -s ours Treehugger Robot 2023-06-06 16:27:51 +00:00
• b8b5d2e02a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours am: 4fdf445fc4 -s ours am: 0f8055172f -s ours am: ac729b4c8d -s ours Bill Yi 2023-06-06 16:27:40 +00:00
• 0fe3ecacab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: 76c1870f35 -s ours am: a1f4ce4630 -s ours am: 9fde218320 -s ours Treehugger Robot 2023-06-06 16:21:18 +00:00
• 9dd55db791 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: 2ca99ffb12 -s ours am: 4eae0d6d34 -s ours am: 7151600a5a -s ours Bill Yi 2023-06-06 16:21:14 +00:00
• 54e19e68f5 Merge changes from topic "am-bf5c0a3c14b74e2d967841198557db9f" into udc-dev-plus-aosp am: ed4143dc5b am: e64b222833 am: 36ba90a1ee Automerger Merge Worker 2023-06-06 16:20:22 +00:00
• 1e94c41743 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: 7db508358d -s ours am: 27778df8f6 -s ours am: a93ef6d447 -s ours Treehugger Robot 2023-06-06 16:19:49 +00:00
• 6abdec5254 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 763b15231f -s ours am: 6cb60f0b37 -s ours am: d34e9c4a90 -s ours am: 93b91cce2f -s ours Treehugger Robot 2023-06-06 16:19:15 +00:00
• b6aac7c05a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 32fce5403f -s ours am: 4efcac35a5 -s ours am: 6e20f60e75 -s ours am: 2bdb446351 -s ours Bill Yi 2023-06-06 16:19:10 +00:00
• 4c43d97d86 Merge changes from topic "am-a85daf5f57ad4c94a8e17cfffed8df36" into udc-qpr-dev-plus-aosp Automerger Merge Worker 2023-06-06 16:08:08 +00:00
• 3c8b2b65a0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae -s ours am: 1a02d5733e -s ours Treehugger Robot 2023-06-06 16:07:56 +00:00
• 1102ffa8c7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1108d7d99 -s ours am: 90d348eabc -s ours Bill Yi 2023-06-06 16:07:50 +00:00
• 5b283ec7de [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8db6cc323c -s ours am: 650273ab86 -s ours Treehugger Robot 2023-06-06 16:07:45 +00:00
• 396c27ce33 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f346881098 -s ours am: 9c4773b9ae -s ours Bill Yi 2023-06-06 16:07:25 +00:00
• 5a488ab86e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c1fdb0bec2 -s ours am: 7858247c64 -s ours Treehugger Robot 2023-06-06 16:07:11 +00:00
• a0e4d90b6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16b5dd96c2 -s ours am: 23022e0835 -s ours Bill Yi 2023-06-06 16:06:59 +00:00
• a1898a0218 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae -s ours am: e0a3e3a8f9 -s ours Treehugger Robot 2023-06-06 16:06:36 +00:00
• f0beeb3c1d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1108d7d99 -s ours am: a4dd0da90d -s ours Bill Yi 2023-06-06 16:06:29 +00:00
• 70bb780dce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8db6cc323c -s ours am: f2d7712bfc -s ours Treehugger Robot 2023-06-06 16:06:24 +00:00
• 656362603c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f346881098 -s ours am: f740db022d -s ours Bill Yi 2023-06-06 16:06:02 +00:00
• ad3219fda4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c1fdb0bec2 -s ours am: 4b7663cbf1 -s ours Treehugger Robot 2023-06-06 16:05:49 +00:00
• 7fc8621dcd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16b5dd96c2 -s ours am: 59f5c56e84 -s ours Bill Yi 2023-06-06 16:05:38 +00:00
• e576574ac9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: 1dc6b2d265 -s ours am: 28a5ce5fc5 -s ours Treehugger Robot 2023-06-06 16:04:52 +00:00
• cabcc64d06 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: c0e9862110 -s ours am: 524d887d72 -s ours Bill Yi 2023-06-06 16:04:48 +00:00
• 844d8a272e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: 1dc6b2d265 -s ours am: 44ccdc1fee -s ours Treehugger Robot 2023-06-06 16:02:23 +00:00
• 572b37da04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: c0e9862110 -s ours am: e881cb0f82 -s ours Bill Yi 2023-06-06 16:02:19 +00:00
• 76b9f31667 Merge changes from topic "am-ee1e11b48ff64035aa2f6bbc85aea648" into udc-qpr-dev-plus-aosp Automerger Merge Worker 2023-06-06 16:00:21 +00:00
• 213cfbba28 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: 12ec34641e -s ours am: 9c6aa99c82 -s ours Treehugger Robot 2023-06-06 15:58:26 +00:00
• f3c5b4b5e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670 -s ours am: fe99021d55 -s ours am: 9180964e49 -s ours Bill Yi 2023-06-06 15:58:23 +00:00
• 178a4c1da3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: 12ec34641e -s ours am: 7e87dbe180 -s ours Treehugger Robot 2023-06-06 15:58:18 +00:00
• fb9d94f892 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485 -s ours am: 04f844c712 -s ours am: b61f2fca16 -s ours Treehugger Robot 2023-06-06 15:58:17 +00:00
• 80ae5377ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ea2e6b3670 -s ours am: fe99021d55 -s ours am: 702dadee71 -s ours Bill Yi 2023-06-06 15:58:16 +00:00
• 19d2aa0e80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d8d85a8485 -s ours am: 04f844c712 -s ours am: e5649218f3 -s ours Treehugger Robot 2023-06-06 15:58:10 +00:00
• 70f2233eb8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours am: 5e71a3fdf4 -s ours am: ff6629bf08 -s ours Bill Yi 2023-06-06 15:58:05 +00:00
• 33f5a5a0b5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7d99401b8e -s ours am: 5e71a3fdf4 -s ours am: 16cb3a2b76 -s ours Bill Yi 2023-06-06 15:58:03 +00:00
• e5bf567739 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours am: f14e96fe88 -s ours am: d38c1958fa -s ours Treehugger Robot 2023-06-06 15:57:48 +00:00
• 5c864d3727 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8c296cdd64 -s ours am: f14e96fe88 -s ours am: df93f73e95 -s ours Treehugger Robot 2023-06-06 15:57:48 +00:00
• ac729b4c8d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours am: 4fdf445fc4 -s ours am: 0f8055172f -s ours Bill Yi 2023-06-06 15:57:33 +00:00
• 80f650a93c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d152c7b1bf -s ours am: 4fdf445fc4 -s ours am: 6b2bcbd3ca -s ours Bill Yi 2023-06-06 15:57:26 +00:00
• 9fde218320 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 059773bd86 -s ours am: 76c1870f35 -s ours am: a1f4ce4630 -s ours Treehugger Robot 2023-06-06 15:54:00 +00:00
• 7151600a5a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 284d320abb -s ours am: 2ca99ffb12 -s ours am: 4eae0d6d34 -s ours Bill Yi 2023-06-06 15:53:57 +00:00
• 36ba90a1ee Merge changes from topic "am-bf5c0a3c14b74e2d967841198557db9f" into udc-dev-plus-aosp am: ed4143dc5b am: e64b222833 Automerger Merge Worker 2023-06-06 15:52:33 +00:00
• a93ef6d447 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: ba4dc8f0bc -s ours am: 7db508358d -s ours am: 27778df8f6 -s ours Treehugger Robot 2023-06-06 15:52:23 +00:00
• 93b91cce2f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f996cfceba -s ours am: 763b15231f -s ours am: 6cb60f0b37 -s ours am: d34e9c4a90 -s ours Treehugger Robot 2023-06-06 15:50:52 +00:00
• 2bdb446351 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 506e105fdb -s ours am: 32fce5403f -s ours am: 4efcac35a5 -s ours am: 6e20f60e75 -s ours Bill Yi 2023-06-06 15:50:46 +00:00
• 9bad806f2a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 0fc88fe5ec -s ours am: 02c5459d68 -s ours TreeHugger Robot 2023-06-06 15:42:29 +00:00
• f7185500b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c66d6726f0 -s ours am: 128cd4f2e3 -s ours Bill Yi 2023-06-06 15:42:24 +00:00
• 35faea6b31 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ce5a816f29 -s ours am: 6057f53e47 -s ours TreeHugger Robot 2023-06-06 15:42:19 +00:00
• 3dfd90eb61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c96c00059d -s ours am: bf81fa53f6 -s ours Bill Yi 2023-06-06 15:42:04 +00:00
• d709e438a9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6c069119ea -s ours am: e25f1bad4c -s ours TreeHugger Robot 2023-06-06 15:41:51 +00:00
• 1de7398fb9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bd46bde1e6 -s ours am: 33f947241d -s ours Bill Yi 2023-06-06 15:41:37 +00:00
• e0a3e3a8f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae -s ours Treehugger Robot 2023-06-06 15:39:39 +00:00
• a4dd0da90d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1108d7d99 -s ours Bill Yi 2023-06-06 15:39:26 +00:00
• f2d7712bfc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8db6cc323c -s ours Treehugger Robot 2023-06-06 15:39:22 +00:00
• f740db022d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f346881098 -s ours Bill Yi 2023-06-06 15:39:02 +00:00
• 1a02d5733e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: fb4945a4ae -s ours Treehugger Robot 2023-06-06 15:38:50 +00:00
• 4b7663cbf1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: c1fdb0bec2 -s ours Treehugger Robot 2023-06-06 15:38:49 +00:00
• 90d348eabc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e1108d7d99 -s ours Bill Yi 2023-06-06 15:38:42 +00:00
• 59f5c56e84 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16b5dd96c2 -s ours Bill Yi 2023-06-06 15:38:37 +00:00
• 650273ab86 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 8db6cc323c -s ours Treehugger Robot 2023-06-06 15:38:37 +00:00
• 9c4773b9ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f346881098 -s ours Bill Yi 2023-06-06 15:38:17 +00:00