Commit Graph

134007 Commits

Author SHA1 Message Date
Treehugger Robot
4aa411dd4a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5 -s ours am: 5152042cef -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iee6751b39d5444ed6d6fbfbcf7177b509b52e536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:51:49 +00:00
Bill Yi
7c41697bed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6 -s ours am: a3c28a2091 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I16f103b18c8781c4a2e4f58950f93df63a482daf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:51:46 +00:00
Treehugger Robot
08d6c6baee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff -s ours am: 3838cd44da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I602dfab48db1ea812c2db606f9510a6382b7dcd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:51:42 +00:00
Bill Yi
665f49b670 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941 -s ours am: 891a483a94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2918c9daa28c1beda0567ad56534b2c4e4b48290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:51:25 +00:00
Bill Yi
ee4c57c11c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981 -s ours am: c7762b5610 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id47a02c432d6bc2f352971d2658d3d8f4494bdae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:51:08 +00:00
Justin McClain
d971817112 Fixing RemoteAuth Tests breakage
Fixing RemoteAuthEnrollFinishTest, RemoteAuthEnrollEnrollingTest, and
RemoteAuthSettingsTest by changing `isDisplayed()` check to the intended
`withEffectiveVisibility()`.

Bug: b/296191086
Test: make RunSettingsRoboTests -j40
Change-Id: I3405fd2709c83a966b83106c804880d00fc4bbf4
2023-08-16 18:45:09 +00:00
Treehugger Robot
bc55c69e9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 62c6c859fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80e30780102be03e22ba2057551f6799b6811d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:38:08 +00:00
Bill Yi
3f1da62e96 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 1b8cdb3c54 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I76d858a43a4ee8bb6c6d1cdedb35a5fdf7ce9818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:38:04 +00:00
Treehugger Robot
cd8a489f80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: b04d88f081 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c99032187d7b58cc41508ac156e65a9a3ab2fc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:37:56 +00:00
Bill Yi
34a88d2b41 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: f7a1f6301c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic61fc2fa352df457d634a7eacc97bd0f1f93dc6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:37:46 +00:00
Bill Yi
f249e4a70a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 0d737ffce4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8fc4ebd8190d209e35ff4d8550299abbe44970f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:37:29 +00:00
Treehugger Robot
df335dfd78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 62c6c859fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8513a05fb77c2d4414a932ba8d76f211085f4abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:36:23 +00:00
Bill Yi
0341e80c5a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 1b8cdb3c54 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I51e50cfcb8d4f6679ffa5bbafa5efe3df119b16a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:36:13 +00:00
Treehugger Robot
d751e40eb5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: b04d88f081 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib74ee2d7714b8dd18027eca83ddb0f3d2abedd59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:36:04 +00:00
Bill Yi
5a56fb9727 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: f7a1f6301c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4d38769e642c41a06b4dd8e1b4931f2159fdddd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:35:48 +00:00
Bill Yi
cc4724d018 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 0d737ffce4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I93d49a95aee795501adea2c190f9bc63a1580fa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:35:43 +00:00
Treehugger Robot
f53e0c2d9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd0c5b55e179638071765298ba9a01def42c1438
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:34:46 +00:00
Bill Yi
cc1b89c2a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ea46a8291def07a7767726cb48b17336f7dda1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:34:42 +00:00
Treehugger Robot
0ed7579d93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd50b7d797bd76170b82df0c2bd5e71341123539
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:34:35 +00:00
Bill Yi
adec329708 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I847dff977039ec6c5da2b8cf47f5eeef3eccbf55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:34:17 +00:00
Bill Yi
bb47e1653c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic93fbbb979ca520c447f550cb20ed5c9d626911a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:34:05 +00:00
Treehugger Robot
5152042cef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34f956e994b81241969d7acca0b058b7f9c90f2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:33:39 +00:00
Bill Yi
a3c28a2091 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6010b1624cd775b42cd5ba2a4a1dc9e1217a9cb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:33:36 +00:00
Treehugger Robot
3838cd44da [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieb3af1080163c88583ef6eef2ae685b54a4bcf04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:33:28 +00:00
Bill Yi
891a483a94 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1589f5d9786458283f477b96a91e17e0479fbc6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:33:12 +00:00
Bill Yi
c7762b5610 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19410e5ca48c700e7c2747d31f572db6f843ca1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:32:57 +00:00
Treehugger Robot
4f78ce0418 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 317931b506 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I47012aa59ad737e04fecf7c940e430c5e9358548
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:31:11 +00:00
Bill Yi
f2f9fb014f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 3c43f53a65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b516a63ccb59a028fc8044367c14c844b0dd508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:31:03 +00:00
Treehugger Robot
a842ed7c47 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: 094103da6d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae8313d431005a96887a68c310865c6a8c804bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:30:59 +00:00
Bill Yi
cd9465109b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: 1f4e5b2024 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I284895f2abfedb0e2d54556d2568d8a3dcb49d6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:30:47 +00:00
Bill Yi
44bc24bb32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 721d30309e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If425a587f6dc0eecf5e5f63dc86f1f0be26fc057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:30:34 +00:00
Treehugger Robot
dacbb6472a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: c3cd16d5b8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9a137c72c205835def6788c222acfab9ab01ed78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:30:21 +00:00
Bill Yi
c0a08d8d80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 08e62ded38 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie43303d228395bd4f35812635f1e3a7d88fbc9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:30:12 +00:00
Treehugger Robot
3e97718152 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: 1b931db3c4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5381652157302c8438df6dfd5afe9dad7e5fda8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:30:04 +00:00
Bill Yi
7a2398d9c3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: 7046a1bc58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia0cdafcef56a7dd67c4a950f483f6ea992c8363e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:29:49 +00:00
Bill Yi
dceba1f16c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: dd6b25ed95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6dfc7d65a5f4990940ac51a783adb5adc7d9afef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:29:42 +00:00
Treehugger Robot
3fedf9ec23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 960d04f4fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib2c0c1f0d21d9232a1fc2b48212ae20633cc799e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:15:16 +00:00
Bill Yi
819bdb380d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f1150a448 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e2c9549775a2f0a8639104b428a5489b50e603e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:15:13 +00:00
Treehugger Robot
dfa01168ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b9e13e44d8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67d6c789a12d1b01a7ba3b2a9ca5839148af6996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:15:10 +00:00
Bill Yi
5a87ee3132 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55bf4eab3c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib800197d9a8b8c9a42aa7e2ead7a273f63477cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:15:06 +00:00
Treehugger Robot
0f8ac3a82b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 5ea61f6900 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I01e3fef35540addc4fd54551563c93e592da6b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:14:55 +00:00
Bill Yi
1a8d90b337 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2db4ba3b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib286ba6cf5549565b8c080debab8e03084f72f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:14:26 +00:00
Treehugger Robot
960d04f4fe Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-16 17:29:50 +00:00
Treehugger Robot
b9e13e44d8 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-16 17:29:50 +00:00
Treehugger Robot
5ea61f6900 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-16 17:29:50 +00:00
Treehugger Robot
317931b506 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieace9704187dae85ede838fb8f2976b57ceeb465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 17:29:49 +00:00
Bill Yi
3c43f53a65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If6b538c0aebb36aed4840dad43695b9b3fe669f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 17:29:41 +00:00
Treehugger Robot
094103da6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa7f5bf0ac48811d5202ed362e6718b053d9a431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 17:29:32 +00:00
Bill Yi
1f4e5b2024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8018d49e5fc8aa6f828c7a7ff399ab6fe5a910b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 17:29:17 +00:00
Bill Yi
721d30309e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iec109478a187687646c43ae05f50ab72a7ad2f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 17:29:11 +00:00