Commit Graph

106902 Commits

Author SHA1 Message Date
TreeHugger Robot
e852811d18 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-06-06 22:36:20 +00:00
TreeHugger Robot
2f7607e362 Merge "Restrict network preferences settings" into tm-qpr-dev am: 5afb322f3a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18702206

Change-Id: I6ab51f8b19893985160d0f46978199293fc52cdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:00:03 +00:00
TreeHugger Robot
1f253bd647 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours am: 4154883a76 -s ours am: adde365e6e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I128ae596e47afc65e37c4ec0c209178db95611af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:58:42 +00:00
Bill Yi
45c737a710 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours am: 14477b9d65 -s ours am: 7eafff0852 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d476a36c8bb4a84ff2e7e1baa856746e0182e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:58:33 +00:00
TreeHugger Robot
f19b21a1b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours am: 4154883a76 -s ours am: 6f57f029f9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I896c8680c29ce0992e90442cee733dc4b42c5531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:57:06 +00:00
Bill Yi
3e991d67c0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours am: 14477b9d65 -s ours am: 7128d2dba8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic580ed686279abaf8306e42ba23f2fba5bb54882
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:57:00 +00:00
TreeHugger Robot
1262ed56a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours am: 1a351b24fc -s ours am: cbcf547b73 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibaee94a82d78e6f53ed828285dfd2e1d68614207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:55:41 +00:00
Bill Yi
50ecce9047 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours am: 9481e02299 -s ours am: 052cd7c249 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9993c99196a1d372b894159748869139e2dfa508
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:55:34 +00:00
Treehugger Robot
7d84622f6d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe38e396b2 -s ours am: 110c20fff0 -s ours am: a3d3cc0471 -s ours am: d4f5d00cd5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I49c7f6274881ae9385fd7b904f87737480fa2542
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:54:43 +00:00
Bill Yi
5ffbbe94d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 908d98e833 -s ours am: 30d09d7e03 -s ours am: 3451a4ac62 -s ours am: 8b0b0699e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I88547189b65426baadc0046f34b2493f1b8256e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:54:26 +00:00
Treehugger Robot
d2ee44fd77 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c2d1ef5127 -s ours am: 75cadf738b -s ours am: c7c64676f7 -s ours am: e07d619a19 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I526f386a13e2ef82ff416bacdb7b3d62ddf41d04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:54:10 +00:00
Bill Yi
2cfac01249 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853 -s ours am: 910530931f -s ours am: 66779a5357 -s ours am: 99f4399147 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I75972b48734a81037b825c2f09f7673af8c289d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:53:55 +00:00
TreeHugger Robot
5afb322f3a Merge "Restrict network preferences settings" into tm-qpr-dev 2022-06-06 21:42:30 +00:00
TreeHugger Robot
6f57f029f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours am: 4154883a76 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b39edbfff5052255820ca45e067bc3cc7932db2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:33:57 +00:00
TreeHugger Robot
adde365e6e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours am: 4154883a76 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I34e6707b67cea4d76a0a8dfeb27998007ff69ef7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:33:52 +00:00
Bill Yi
7128d2dba8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours am: 14477b9d65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5895d49b9ec3aa105ab6a666ba997add9858ad65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:33:46 +00:00
Bill Yi
7eafff0852 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours am: 14477b9d65 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie271b0f155ea246b5a9795377e24b8698d00ac16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:33:40 +00:00
TreeHugger Robot
cbcf547b73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours am: 1a351b24fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I29bfc524ee6dbfa13bf9f9d552df6dc3e7226951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:30:57 +00:00
Bill Yi
052cd7c249 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours am: 9481e02299 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85df4ba0ac229204f436bf8f4da677931ec91c62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:30:51 +00:00
Treehugger Robot
d4f5d00cd5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe38e396b2 -s ours am: 110c20fff0 -s ours am: a3d3cc0471 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifadafe02e9117e6861a412130b9c860b8db1e454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:29:04 +00:00
Bill Yi
8b0b0699e3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 908d98e833 -s ours am: 30d09d7e03 -s ours am: 3451a4ac62 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I906b826b19c1c0e2e6f22bce77e5c9bb7fe508c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:28:50 +00:00
Treehugger Robot
e07d619a19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c2d1ef5127 -s ours am: 75cadf738b -s ours am: c7c64676f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide263893ad714267b8e818d22956a97c322de413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:28:33 +00:00
Bill Yi
99f4399147 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853 -s ours am: 910530931f -s ours am: 66779a5357 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5cd20b51f56f9318ec6726dc3367e20eca57e203
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:28:15 +00:00
TreeHugger Robot
4154883a76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25682928f11c3910529d7b678e5de23135d10386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:16:18 +00:00
Bill Yi
14477b9d65 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I515632ed85faa537ad76adff45c98b4b1e62f2d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:16:04 +00:00
TreeHugger Robot
1a351b24fc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6769eee779 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibdf35d15941087d02320ceffaa3a74f4c542cc18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:14:05 +00:00
Bill Yi
9481e02299 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d3dc439a10 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0a385e531b4a2a27fde25dcf4b9c1d02220e389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:13:51 +00:00
TreeHugger Robot
6769eee779 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-06 21:03:12 +00:00
Treehugger Robot
a3d3cc0471 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe38e396b2 -s ours am: 110c20fff0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I992ddb7979fc0d49731a673ba7baf85e2b547db9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:02:45 +00:00
Bill Yi
3451a4ac62 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 908d98e833 -s ours am: 30d09d7e03 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie0888f421abf49fe4e182551c7e7a448a6e9adb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:02:34 +00:00
Treehugger Robot
c7c64676f7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c2d1ef5127 -s ours am: 75cadf738b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3bd2b32ed9e822b026165ab01c0d10e7285e88dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:02:16 +00:00
Bill Yi
66779a5357 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853 -s ours am: 910530931f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b14a472c83060809f8e28f705467145b2893437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:01:57 +00:00
TreeHugger Robot
b24099bfe9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 95b4c4798d -s ours am: c64edf7b3d -s ours am: 0df7bb86dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib00c9a632fded11c582d7128bf1cb654597d0667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:41:06 +00:00
Bill Yi
fa7a076610 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88b4a11c90 -s ours am: 070b5431bb -s ours am: 250e236ed6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I871ef70267a6d36a88deed098ef8605ce0a3b615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:40:59 +00:00
TreeHugger Robot
228439e046 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 059271dcc4 -s ours am: 789c7d4d0d -s ours am: 95858898f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I925964cece5726614d3a2476902f1cb95de8bfdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:40:45 +00:00
Bill Yi
802ea812c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71660567f7 -s ours am: cf50c84e8d -s ours am: 9c85ce5af4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I189a48689626420f36b37cdf1df20cb954c32798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:40:35 +00:00
TreeHugger Robot
0df7bb86dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 95b4c4798d -s ours am: c64edf7b3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie9b19eeaafd87b91c269a6971667967aa8d31874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:56:43 +00:00
Bill Yi
250e236ed6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88b4a11c90 -s ours am: 070b5431bb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic69bb16d8a8560d1b50f3e62ffce201ce311ecd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:56:36 +00:00
TreeHugger Robot
95858898f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 059271dcc4 -s ours am: 789c7d4d0d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I56f8438b2be6fd45cdfc2a4b9b1d697b9bf88ad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:56:23 +00:00
Bill Yi
9c85ce5af4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71660567f7 -s ours am: cf50c84e8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6e9d243f3ff38028d364726b7da9d18acbba38c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:56:13 +00:00
TreeHugger Robot
c64edf7b3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 95b4c4798d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3441f146bc9070e8ab71cfb205edaa8363c9c903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:44:49 +00:00
Bill Yi
070b5431bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88b4a11c90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5f0eb3e6195e1f40169fa3f1d36c1fc6963867bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:44:31 +00:00
TreeHugger Robot
789c7d4d0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 059271dcc4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d87a4e080463d2d70798e1a67c0d023bd9b31e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:44:23 +00:00
Bill Yi
cf50c84e8d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 71660567f7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92013752f94269892d8c0bd1c38746c1f6a8a3fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:44:05 +00:00
Weng Su
a09c33f49c Restrict guest user to configure WiFi access points
- If the user is not allowed to configure Wi-Fi access points, close WifiDialogActivity.

Bug: 226133034
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: I32d0c5beceb8a140a98636a5a0af97790495620d
2022-06-07 03:30:01 +08:00
Treehugger Robot
110c20fff0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fe38e396b2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I219fdf84a32d625cc1db2a8cad3f0e2fad99a630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:20:01 +00:00
Bill Yi
30d09d7e03 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 908d98e833 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6cb0c78ac4a1fff67ad24036e65b670f5a8429c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:19:37 +00:00
Treehugger Robot
75cadf738b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c2d1ef5127 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I457f144c16992753458de5d48f16ec254f9a336a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:19:19 +00:00
Bill Yi
910530931f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 36ddfc8853 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I44cb030d201c6df90d090ff8234522498911a1f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:19:06 +00:00
TreeHugger Robot
f4288c7bc0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 18675f81a0 -s ours am: 2487eb86dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17c80070819440b9ad25fdcba9b921b3775a44f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:10:44 +00:00