Commit Graph

134156 Commits

Author SHA1 Message Date
Treehugger Robot
3e5a45c53a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 62c6c859fb -s ours am: df335dfd78 -s ours am: 192b3d2519 -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: I3a680141630955a7cdab947e4b24625916d7c448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:10:53 +00:00
Bill Yi
7a69d45717 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 1b8cdb3c54 -s ours am: 0341e80c5a -s ours am: 166472f8f7 -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: Ibfaa2f435e6b9b3ccc534b2701ff882e59234cb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:10:50 +00:00
Treehugger Robot
0abe69b5b3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: b04d88f081 -s ours am: d751e40eb5 -s ours am: 95e165200c -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: I8900783b2589e0b11c56827f7d538274c8d9937a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:10:43 +00:00
Bill Yi
c2bc17d81e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: f7a1f6301c -s ours am: 5a56fb9727 -s ours am: 46ccfabc0b -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: I0402494f35154df79eb258a0331d45287bfd1eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:10:36 +00:00
Bill Yi
d8c680a8b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 0d737ffce4 -s ours am: cc4724d018 -s ours am: 6ddc9eebcf -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: If1b3e97609324fe1d5acf200f83b66ec39eeb3a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:10:12 +00:00
Treehugger Robot
5976affbb0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5 -s ours am: 5152042cef -s ours am: 4aa411dd4a -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: I7f3814d917e3d48fe83ecdae9ebcd394c2627ef8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:06:42 +00:00
Bill Yi
4264a42099 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6 -s ours am: a3c28a2091 -s ours am: 7c41697bed -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: I9bc3de1ee475b57d206be6a786e4bf2af07387bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:06:39 +00:00
Treehugger Robot
64a6ffd904 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff -s ours am: 3838cd44da -s ours am: 08d6c6baee -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: Ic92a82c945ab285b35bbbf7d92a5f772434ab9e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:06:34 +00:00
Bill Yi
5ded0e8848 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941 -s ours am: 891a483a94 -s ours am: 665f49b670 -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: I7d3cf75c563eb2e525b6eafa96991c252b948cb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:06:19 +00:00
Bill Yi
0fdc38f010 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981 -s ours am: c7762b5610 -s ours am: ee4c57c11c -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: If229ee3636c9ff3d3d6ed9ee951e7d072fc3ad0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:06:00 +00:00
Treehugger Robot
59b0d816e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 960d04f4fe -s ours am: 3fedf9ec23 -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: I11342d78b3cf02dbc84e33b38e7eb9e2ba3774ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 01:57:42 +00:00
Bill Yi
93b5773b58 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7f1150a448 -s ours am: 819bdb380d -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: Ia0190e914569f7965aeb4a130708205c54b949a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 01:57:40 +00:00
Treehugger Robot
9c7ab77ad4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: b9e13e44d8 -s ours am: dfa01168ab -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: I03a601090941c64d08c7d9332e16b18fe217599b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 01:57:37 +00:00
Bill Yi
dcb771d7dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55bf4eab3c -s ours am: 5a87ee3132 -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: I4a5c48cb336950defbd707520c9f165a17be6c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 01:57:28 +00:00
Treehugger Robot
88cd6004e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 5ea61f6900 -s ours am: 0f8ac3a82b -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: Ibec89ebc49161d4509f5a54069f278bfefb1230c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 01:57:12 +00:00
Bill Yi
7fe4f7aa4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2db4ba3b4 -s ours am: 1a8d90b337 -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: I5eb07b9d873a74f10464f9ba40f0bd8ec3fbc7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 01:56:54 +00:00
Bill Yi
a9ac8645fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 0da3cedcc0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic06029241cde83e605423998553179948ba838bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:25:52 +00:00
Bill Yi
5a16ea8c50 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e04caacadf -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idf051e3e6395b6339ff349297abcbba1c54c6941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:25:39 +00:00
Bill Yi
c76d273cef Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-16 23:43:22 +00:00
Bill Yi
8bb5edf23c Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-16 23:43:22 +00:00
Bill Yi
d3176987b0 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2023-08-16 23:43:22 +00:00
Bill Yi
0da3cedcc0 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-08-16 23:42:56 +00:00
Treehugger Robot
7e297c494a Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a am: 47f8568209 am: fc02a337f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: I413aa389f8fee42e7e2d42acb2430034860b170d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 23:41:22 +00:00
Treehugger Robot
fc02a337f8 Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a am: 47f8568209
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: I32983b0b8ef21c1630b475ec02bd65c8166699b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:56:33 +00:00
Treehugger Robot
47f8568209 Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493 am: 565161fb1a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: Ic7d2922b78791b84fd7caaee33e91a2ea35acc48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 22:11:01 +00:00
Treehugger Robot
565161fb1a Merge "Use ArrayMap to cache active subscriptions" into main am: 29ee574493
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2704973

Change-Id: If3767eedff3437224ea7a3864bd48496f392f50d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 21:27:43 +00:00
Treehugger Robot
29ee574493 Merge "Use ArrayMap to cache active subscriptions" into main 2023-08-16 20:39:14 +00:00
Treehugger Robot
5329b06ae7 Merge "Fixing RemoteAuth Tests breakage" into main 2023-08-16 19:43:10 +00:00
Treehugger Robot
2f6fc7155a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 62c6c859fb -s ours am: bc55c69e9c -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: I7987a08dfd53e9b40c23cda1ee68d0f7c8d2a908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:22:14 +00:00
Bill Yi
05b9ab239f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 1b8cdb3c54 -s ours am: 3f1da62e96 -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: I9feb01e0726ac86eb6e96daa784e66886ab59a54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:22:10 +00:00
Treehugger Robot
63353599ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: b04d88f081 -s ours am: cd8a489f80 -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: If8f1e5a228ef5b76c71cfabacc2f6218c9b96651
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:22:01 +00:00
Bill Yi
3d0cc12624 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: f7a1f6301c -s ours am: 34a88d2b41 -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: I6e87a3f836d5744945817cc257d7fd748c17c44d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:21:51 +00:00
Bill Yi
d79d7df867 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 0d737ffce4 -s ours am: f249e4a70a -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: I99370c57d7bf414d488266cd03af4d55e14cf91f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:21:33 +00:00
Treehugger Robot
829a488fe9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 42e15a0ff5 -s ours am: f53e0c2d9a -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: I138e268689fb473ba84f7dfdccf14e1aad7a60ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:18:31 +00:00
Bill Yi
22041ca1e6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 33cf2a3dd6 -s ours am: cc1b89c2a8 -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: Ib2108aae8724f11d2a8fcc7bfe1ffa49a509da2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:18:27 +00:00
Treehugger Robot
f705cb9c26 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: eb5aef41ff -s ours am: 0ed7579d93 -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: Ic7651fc5d40df93de58e353a6d58126b0321d2f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:18:17 +00:00
Bill Yi
fe4af04f71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c382e6941 -s ours am: adec329708 -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: I01c28e0c5d344c90b424af7cc162b4f20172ba72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:17:58 +00:00
Bill Yi
4ce3453e9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf2c3e9981 -s ours am: bb47e1653c -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: Iae35e406c13851537fb9fa496423a1a200df9463
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:17:48 +00:00
Treehugger Robot
8c89d545a5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: c3cd16d5b8 -s ours am: dacbb6472a -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: I718295a5006809cf55cba9b9f1e61550caf74123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:12:59 +00:00
Bill Yi
bb13b0f059 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 08e62ded38 -s ours am: c0a08d8d80 -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: I2fbddd4ab5ef3d3894d02a9a9e15ce3ddfe03b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:12:53 +00:00
Treehugger Robot
95878472d2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: 1b931db3c4 -s ours am: 3e97718152 -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: I5b7385a4af440c7991bfc75ecc9dbc849b10d98e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:12:46 +00:00
Bill Yi
4a90f9b832 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: 7046a1bc58 -s ours am: 7a2398d9c3 -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: I2db01e98d570385edbfa048e92790b49116af70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:12:37 +00:00
Bill Yi
448f61d46c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: dd6b25ed95 -s ours am: dceba1f16c -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: I249731d71aa85f67619e50c2e500080609a98b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 19:12:19 +00:00
Treehugger Robot
192b3d2519 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4585b13c9a -s ours am: 62c6c859fb -s ours am: df335dfd78 -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: I56602b47eac7af6dbf88f087493003c9fcb8bff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:56:41 +00:00
Bill Yi
166472f8f7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f67ff302c5 -s ours am: 1b8cdb3c54 -s ours am: 0341e80c5a -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: I787df4ba724f79b2ad1241c96835d7e7f70e7608
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:56:37 +00:00
Treehugger Robot
95e165200c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7de409b834 -s ours am: b04d88f081 -s ours am: d751e40eb5 -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: I90a99cc994ae057d6f337b399b2408ad3083651c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:56:27 +00:00
Bill Yi
46ccfabc0b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 863f3e3a35 -s ours am: f7a1f6301c -s ours am: 5a56fb9727 -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: I81bad65ed7f65b8ee551f163eb939bff12ff807d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:56:18 +00:00
Bill Yi
6ddc9eebcf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 55c45ed419 -s ours am: 0d737ffce4 -s ours am: cc4724d018 -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: I98da3f1e3e6ea11a904c752230ed22a6f5a9ac07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 18:55:59 +00:00
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