Commit Graph

103743 Commits

Author SHA1 Message Date
TreeHugger Robot
ec6d0cc375 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99 -s ours am: d694708421 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8cc11dce1ac425df2ee58b22ea3f59c8ad4f2c1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:46:28 +00:00
TreeHugger Robot
fcb4079f15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99 -s ours am: d694708421 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5713b2d3671ed905a7174d5cd241d7440335ca63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:45:10 +00:00
TreeHugger Robot
775739c7b9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837 -s ours am: 11c23a6a04 -s ours am: 640cbd98af -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12ae03b14c915a3575b0046932852aa9acca0835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:44:40 +00:00
Bill Yi
9230fb03d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c5a30e12e -s ours am: 2569970104 -s ours am: edd538585e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6339d92bdbd3aaddc4abc7b244eaa65bbd259ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:44:39 +00:00
Arc Wang
e5e271bfed Hide non-system overlay window on ActivityPicker am: c4121c15e4 am: 21a0db9882
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100

Change-Id: Id6820351a67c2b2924a9a6ee3a06731519510ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:44:36 +00:00
TreeHugger Robot
4097859218 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev am: 76774d9229 am: 4ec4191709 am: 8bbcb0d5e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731

Change-Id: I76c90f866f97e85eb57c0597b12b4e92bbecfa07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:44:31 +00:00
Bill Yi
530add3543 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b am: d0019169fc -s ours am: 1e61214e45 -s ours am: 5a2f516216 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb5789d9ef2c076467d3b2b5cbc5c4efd374eaea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:44:29 +00:00
TreeHugger Robot
11522c0e71 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcce77a0ce -s ours am: bba674ffe1 -s ours am: 9afb293be5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85c1783747c8cf5736fbc51f0229f65e60f67f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:44:08 +00:00
Bill Yi
4a66d8fb5c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ac1b5fd50 -s ours am: f3020bd56f -s ours am: 65c8955fc9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d29409c537a3ee901f5ced3cb7f4a645f747230
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:44:07 +00:00
TreeHugger Robot
76c09d598c [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours am: eb37fe4394 -s ours am: efbebfda1f -s ours am: 49ad55503b -s ours am: fcbf430ef7 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: I44227494860c6edbc6962a7a75dabcc292d26ad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:42:58 +00:00
TreeHugger Robot
640cbd98af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837 -s ours am: 11c23a6a04 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If261538d1759fec1982c07d77843d8973d1ca67b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:39:45 +00:00
Bill Yi
edd538585e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c5a30e12e -s ours am: 2569970104 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I713bbd9b3c311149ef14bc95ce7d0abb57e1e781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:39:43 +00:00
TreeHugger Robot
8a4255e700 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 061cd8506b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibdfafff67270bf11b49139dff33b09adec208ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:38:47 +00:00
TreeHugger Robot
fef3c04623 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837 -s ours am: 4ce39c1441 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf3feeb9a870a42a14874569ca6fd2123c7009c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:38:31 +00:00
TreeHugger Robot
61e32ec358 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 9db56c5336 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5724864d24977c70bae94a6d57c72bcf38ed742d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:38:15 +00:00
TreeHugger Robot
d694708421 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 22de864c99 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03bd28da190f8a10e88f4226a12eef69d9d1f5d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:37:57 +00:00
Automerger Merge Worker
04b90f6b12 Merge "Merge changes from topic "presubmit-am-7b3335c9cdef4268997e897a42eba222" into tm-mainline-prod am: e2a9ecd37f" 2022-04-07 19:37:38 +00:00
TreeHugger Robot
c127628371 Merge changes from topic "presubmit-am-7b3335c9cdef4268997e897a42eba222" into tm-mainline-prod am: e2a9ecd37f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625450

Change-Id: I5a986c89506c8c814a33099f61e26182812d36d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:37:36 +00:00
Arc Wang
5c314ba8a9 [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 am: 1c8edd20a3 -s ours am: 2adbb69d81 -s ours am: 0c2193a8f2 -s ours am: 572b1c900f -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 877a41b054 is already in history

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

Change-Id: I110485ebba53cb72fcdad56b4b4e72b8d49b778c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:37:34 +00:00
TreeHugger Robot
061cd8506b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-07 19:25:51 +00:00
TreeHugger Robot
cc3f700218 Merge changes from topic "presubmit-am-d9be502146b44984909a37c7880a2a47"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f2c568bba1
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 19:25:51 +00:00
TreeHugger Robot
11c23a6a04 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d689528f06ba8cf282e3dbeaebc29cec7bcd2ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:16:23 +00:00
Bill Yi
2569970104 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c5a30e12e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieacfe4a1369ff915d69b20f09d87415cb8b77801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:16:22 +00:00
TreeHugger Robot
4ce39c1441 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 7e30df1837 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie991ad211f0f13ff0ffe7571b0a5a78d4ce554c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:15:25 +00:00
Arc Wang
21a0db9882 Hide non-system overlay window on ActivityPicker am: c4121c15e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628100

Change-Id: I54645a67488b6c155218eca6c5fb5779daabd495
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 19:15:23 +00:00
TreeHugger Robot
9db56c5336 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-04-07 19:10:42 +00:00
TreeHugger Robot
72e4e8b977 Merge changes from topic "presubmit-am-9b34afc935324cd9a2ce5516b31efe6e"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 65fd2107ef
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 19:10:42 +00:00
TreeHugger Robot
7e30df1837 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-07 18:49:05 +00:00
TreeHugger Robot
e2a9ecd37f Merge changes from topic "presubmit-am-7b3335c9cdef4268997e897a42eba222" into tm-mainline-prod
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c5a30e12e
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 18:49:05 +00:00
TreeHugger Robot
8de5585580 Merge changes from topic "presubmit-am-7b3335c9cdef4268997e897a42eba222"
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c5a30e12e 2p: 09443a8d6d
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c5a30e12e
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 18:49:05 +00:00
TreeHugger Robot
8bbcb0d5e9 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev am: 76774d9229 am: 4ec4191709
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731

Change-Id: I7e897b4b905aba730d98ed8d993746b4ba130014
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:48:23 +00:00
Bill Yi
5a2f516216 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b am: d0019169fc -s ours am: 1e61214e45 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c8a8e772e72011df96d54c2265d83ece6640eea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:48:21 +00:00
TreeHugger Robot
9afb293be5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcce77a0ce -s ours am: bba674ffe1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I885ae925c4e60b9af478d259b50aa487ee77b3ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:48:14 +00:00
Bill Yi
65c8955fc9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ac1b5fd50 -s ours am: f3020bd56f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia8bb02a567db1f5a08118e529ac2ec12a0357ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:48:13 +00:00
TreeHugger Robot
4ec4191709 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev am: 76774d9229
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731

Change-Id: Ie2cedf389563eaadc3d18243b093291e9091d696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:42:01 +00:00
Bill Yi
1e61214e45 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b am: d0019169fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6349541618d60517fef60d91f407dfe2b980593c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:42:00 +00:00
TreeHugger Robot
c3a9261cb9 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev am: 76774d9229 am: 7f37325af8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731

Change-Id: Ic1eb058c82809f96069e322c63d4e752dc411cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:41:54 +00:00
TreeHugger Robot
bba674ffe1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcce77a0ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1edfcda7b55b28377a1d065dfaaec00b4e0088b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:41:51 +00:00
Bill Yi
f3020bd56f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0ac1b5fd50 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba2f30b041de1d470b9eca7277664bb3060ab530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:41:50 +00:00
TreeHugger Robot
bd9b446371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcce77a0ce -s ours am: f5826d9506 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1deeb31734754502f417c8d20257814ae18f4484
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:41:41 +00:00
TreeHugger Robot
e1216a4d7f Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-mainline-prod am: 5bff9c0582
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731

Change-Id: Id64faaa349d7ac64a5f86bf77f1c6618dc109e4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:41:25 +00:00
TreeHugger Robot
dbc70f6a97 Merge changes from topic "presubmit-am-64cf0a3c0b354ea4b1dd5897c8a34a8d" into tm-mainline-prod am: cec5814259
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638124

Change-Id: I5cad89df4f4f9b214785e255805c077f38bae2fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:41:08 +00:00
TreeHugger Robot
fcbf430ef7 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours am: eb37fe4394 -s ours am: efbebfda1f -s ours am: 49ad55503b -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: If6986da64ef1a37ffb5bcf2f30d3c4443b3537bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:41:00 +00:00
TreeHugger Robot
31116b6ab3 [automerger skipped] Merge "Hide non-system overlay window on ActivityPicker" into sc-v2-dev am: df06dcecbe -s ours am: eb37fe4394 -s ours am: efbebfda1f -s ours am: 4e9515820f -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 b95bd5b449 is already in history

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

Change-Id: I39c965a235d2617f8b75be17a50d035469c249e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:40:45 +00:00
Arc Wang
572b1c900f [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 am: 1c8edd20a3 -s ours am: 2adbb69d81 -s ours am: 0c2193a8f2 -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 877a41b054 is already in history

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

Change-Id: I91afac9e4e17556356ae15af489bfdc6b12bd7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:40:34 +00:00
TreeHugger Robot
7f37325af8 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev am: 76774d9229
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17637731

Change-Id: I1ea54e8389e17df766c869578a648efd5de7c121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:40:01 +00:00
Arc Wang
ebb4b36675 [automerger skipped] [automerge] Hide non-system overlay window on ActivityPicker 2p: b95bd5b449 am: 1c8edd20a3 -s ours am: 2adbb69d81 -s ours am: 22d0b8cf8b -s ours
am skip reason: Merged-In I800f0f39a469a95eb36eeaaeb2aa60a39fd916d3 with SHA-1 877a41b054 is already in history

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

Change-Id: Iabb79daf8522bdcbe705ee348221069efa3bcb28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:39:59 +00:00
TreeHugger Robot
f5826d9506 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: dcce77a0ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c75598033153817892574f5a2bc43b695b58ec9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 18:39:20 +00:00
TreeHugger Robot
22de864c99 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-07 18:36:40 +00:00
TreeHugger Robot
76774d9229 Merge changes from topic "presubmit-am-9d5a2ed99542454093d5fcc5fb75139b" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2c4b82e04b
  Import translations. DO NOT MERGE ANYWHERE
2022-04-07 18:36:40 +00:00