Bill Yi
6233a4ce39
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
am: b53a13a2e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I2e30fd8f5c17c1b0c75a769eae3c5ea9362e7204
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:32:13 +00:00
Bill Yi
c0cca64b22
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
am: 09659e52e5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: I9dfb004a6254f78c5c9ab6a4f718deac1cc21023
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:32:06 +00:00
TreeHugger Robot
8c14b68114
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 074ee502db
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I4cb5761fe5ccb02d3ff3a18a0506ec53a2f911c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:31:56 +00:00
TreeHugger Robot
e582a12055
Merge changes from topic "tc_change_22080720_11" into tm-dev am: 4b5e98636d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: Icae2e778c95c44dbfdfb9447f4fbf0a5ffe51b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:30:48 +00:00
Bill Yi
2e2e5de0d0
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
am: b53a13a2e0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I3e53e686020443f7c955fad0377f33c4f1866a77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:30:45 +00:00
Bill Yi
cb32361f41
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
am: 09659e52e5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: I253e6e404e8fe1d96da1b0bad157d9df3e19dc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-08 06:30:36 +00:00
TreeHugger Robot
074ee502db
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2022-08-08 06:15:46 +00:00
TreeHugger Robot
4b5e98636d
Merge changes from topic "tc_change_22080720_11" into tm-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
Import translations. DO NOT MERGE ANYWHERE
2022-08-08 06:15:46 +00:00
TreeHugger Robot
8089ee68b7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-08-08 06:14:23 +00:00
Bill Yi
b53a13a2e0
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f018579680
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551967
Change-Id: I81b0193030cd411cfb96bac41035f1108eb8d711
2022-08-08 03:46:23 +00:00
Bill Yi
09659e52e5
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 28e5ac6564
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19551899
Change-Id: I60ece2eb12a9bffe10f577c34e98eb2e3dab95ce
2022-08-08 03:46:19 +00:00
Bill Yi
f018579680
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic331399e2cd77e79241be5f8c894564ce5013f34
2022-08-07 16:19:51 -07:00
Bill Yi
28e5ac6564
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I547cb6a91451ece2aff22ceadc9c156cf043582c
2022-08-07 16:16:19 -07:00
Bill Yi
7aee397d84
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2bee4360c5ce826ccbebfea10137b32c2598bb8a
2022-08-07 00:10:06 -07:00
Bill Yi
f52497bd40
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6f0b461048e49766d3810c8b40962610084d47ad
2022-08-07 00:01:02 -07:00
Bill Yi
c764b4ac4f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If4fff28727c9bc27e16288c71ca3a8cb85f85e1b
2022-08-06 23:56:46 -07:00
Bill Yi
272619ebfc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I92ca6c87d1e88a3c3306934df34891cc0af31813
2022-08-06 23:53:07 -07:00
Bill Yi
dc05292ad9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 58ee9e7782
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I9f0b5ece1fe7bb519e2570a41cb52905a7e8235f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:51:40 +00:00
Bill Yi
58ee9e7782
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I05c596130b9218456cd091575a324330337fa8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:41:02 +00:00
Bill Yi
30ced1fe68
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours am: 541b8bc18e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I6c6dd86a11ea5acded53ed2838990a9c30e50514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:34:15 +00:00
TreeHugger Robot
bf974aec62
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours am: c8aed9b0ec
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: Iaccc57f4a10ab928f3dd4cedcca5c3027523f7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:33:28 +00:00
Bill Yi
64332a36df
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours am: bc5efdee59
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I78a948803bed5c52e04d22561ca41df6bd23abc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:33:25 +00:00
Bill Yi
94ca1b0629
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours am: fdf95d710f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: If2eb5b5fd3fb9c9d8e05b88f1cd3a6d45e88a3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:33:24 +00:00
Bill Yi
541b8bc18e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours am: 19ea488dcc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: I63318ef3ceac148987969100763bcc5fc5f8bc69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:25:16 +00:00
Bill Yi
19ea488dcc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81b949bbd0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526354
Change-Id: Ice25aff9ab1beaab4a272623928f706427c58186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:18:21 +00:00
TreeHugger Robot
75acc4af17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours am: 3dd47490aa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: Id1dc965603fc7fcde14e76c241b377dbe37078ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:16:31 +00:00
Bill Yi
d450e06355
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours am: f4ef7ae208
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I161fd5a7ea06d5cac8e7f9512507f51fac0e948d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:16:28 +00:00
Bill Yi
f51ecf6636
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours am: 970d5d8599
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: I53ee8b5b248c78e1431f5b609969bafa91cd6055
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:16:27 +00:00
TreeHugger Robot
3dd47490aa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: Id992f50ac08314134d45bf996013efe8e7a60183
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:16:07 +00:00
Bill Yi
f4ef7ae208
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I50f0752de0308825aa5a7d0ff26975e6c7a9295b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:16:05 +00:00
Bill Yi
970d5d8599
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: I2509bd97be9fe12bb55f11f662c746bee61f00fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:16:03 +00:00
Bill Yi
6e7cf8ef64
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d03b14bd2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526352
Change-Id: I00824509069ec859af20988e9b040e8e1c77be86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:16:00 +00:00
TreeHugger Robot
c8aed9b0ec
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 48224eca28
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: I6d2ed696cb4955907e8bb0afc5e3773e3435f702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:14:36 +00:00
Bill Yi
bc5efdee59
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 444ead6a2e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526350
Change-Id: Ib0f9ef2df09c0c7c2a6244ee5a2933ef97215779
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:14:31 +00:00
Bill Yi
fdf95d710f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72fe892fc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19526258
Change-Id: Iea80c3cb8196cd59fce903048f7551186da69b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-07 05:14:27 +00:00
TreeHugger Robot
48224eca28
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-08-07 04:54:21 +00:00
Bill Yi
81b949bbd0
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2dcbbf96274099824349e6469e0d9ff80e2a6a69
2022-08-04 02:12:16 -07:00
Bill Yi
9d03b14bd2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I194ebb751ea7fe7b31022360dc4aa138633d1b66
2022-08-04 01:41:33 -07:00
Bill Yi
444ead6a2e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6da0818ca33daaf08bf8f6d3f508d594d32a519a
2022-08-04 01:32:29 -07:00
Bill Yi
72fe892fc6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6cd9698629063b3c10f043f57a0e5b3df6780a8c
2022-08-04 01:19:33 -07:00
Jeff Sharkey
5991f46a52
Migrate stringslint.py to AyeAye.
...
This script has been deprecated and replaced by AyeAye checks
directly in Gerrit.
Bug: 164530987
Test: none
Change-Id: Ia1baf761e5ca6a1cef7de231d0f320cfaa7e071a
2022-08-03 13:52:10 -06:00
Arc Wang
85768c5916
Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8
am: 6945e70c02
am: c80890c7dd
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940
Change-Id: I615d41ee10fd988b6e91685b7ac3f32a9ddf5f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 04:04:26 +00:00
Arc Wang
c80890c7dd
Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8
am: 6945e70c02
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940
Change-Id: Ib4fcff818a81a38c08f31d552706fc567ec00daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 03:45:28 +00:00
Arc Wang
6945e70c02
Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940
Change-Id: I70b0ae924d8a4410cc29e7f494e85a9b8a7d3abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 03:26:39 +00:00
Arc Wang
671fa153e8
Merge "Crash happens if back button is pressed during "Format as Portable""
2022-08-02 03:11:13 +00:00
Himanshu Rawat
27ce614bf2
[automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev am: 221c09d8df
-s ours
...
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423969
Change-Id: I0ea9b45a24b621b6d2496bc394dd5036309fa6b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:01:17 +00:00
Himanshu Rawat
6076d3acc2
[automerger skipped] Don't cancel passkey entry pairing autonomously am: c2b402bd50
-s ours
...
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19423969
Change-Id: I8c5189fccea87548e4395ae69f6fdb325377e5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-02 02:01:16 +00:00
Himanshu Rawat
221c09d8df
Merge "Don't cancel passkey entry pairing autonomously" into tm-d1-dev
2022-08-02 01:41:58 +00:00
Bill Yi
015915736f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19472171
Change-Id: I59274c79e4f571eebd99498d9bafcf6588142c58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-01 16:59:35 +00:00
Android Build Coastguard Worker
79eeb2d79a
Merge cherrypicks of [19034069, 19194541] into tm-release.
...
Change-Id: I5fe69b3f90b8feea172d4e5962844731a457fe70
2022-07-29 22:36:59 +00:00