Commit Graph

103743 Commits

Author SHA1 Message Date
Bill Yi
c94c92f0b3 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours am: ee03d0172d -s ours am: e82d15ef8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I136f43d18fbe2be4555059af50e62b9712463565
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:34:26 +00:00
Bill Yi
16b15e9e4f [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours am: 4dd803da1d -s ours am: 3e95b42bec -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1e9ec4c58a6e78a850ebe0138447aa0437385205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:34:06 +00:00
Lucas Silva
c444638824 Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24 am: 4e8e70869b am: fd0e2b04e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536

Change-Id: Ibf4218918b925918633fb3d4099fa7c145e4c0e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:08:09 +00:00
Automerger Merge Worker
335b20e8fa Merge changes from topic "am-e53f997983e743b59ec1ef38767a65dd"
* changes:
  [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours am: ee03d0172d -s ours am: 582a27ce82 -s ours
  [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours am: 4dd803da1d -s ours am: 5f2e624999 -s ours
2022-04-08 20:03:56 +00:00
TreeHugger Robot
5ab5374d57 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443 -s ours am: 191b3c66f4 -s ours am: f558466b83 -s ours am: 3e5d657d70 -s ours am: 35296bf106 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia15e22150bbb3f709469b49fbfe6bf67645bf648
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:03:37 +00:00
Bill Yi
085e0c7639 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace -s ours am: 6d933dc234 -s ours am: 405720d804 -s ours am: f2ee75af93 -s ours am: 4c2c0c8058 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If3415c01a63dd964182e80359a5ff02abd6a4f6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:03:35 +00:00
Bill Yi
e16bf1e232 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours am: ee03d0172d -s ours am: 582a27ce82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2cbeb50b09be1dd84439c61c812f8dfd0875c6c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:03:02 +00:00
Bill Yi
604c561eae [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours am: 4dd803da1d -s ours am: 5f2e624999 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifcb2b541d380483c1ea6bc6e6af1c42f29ad4df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:02:43 +00:00
Bill Yi
e82d15ef8a [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours am: ee03d0172d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3df6bb6584553658ba6df7a16b0f114b674747aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:57:44 +00:00
Bill Yi
3e95b42bec [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours am: 4dd803da1d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f862634a2cebfda51de21a9a7df5df368ab25b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:57:21 +00:00
Bill Yi
582a27ce82 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours am: ee03d0172d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I199b09573525dc0bf7b90a78536eff65417b374e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:56:57 +00:00
Bill Yi
5f2e624999 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours am: 4dd803da1d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5fd0d2114a135d8a789f2ccd2f8cf6325056ebb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:56:36 +00:00
TreeHugger Robot
75bf761ef1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb -s ours am: 71308f95e1 -s ours am: 4470dcd6c6 -s ours am: 8fca0e1e69 -s ours am: 93af59105a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iddd061e78ce020118d26dfd258e75dd3330b9488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:54:33 +00:00
TreeHugger Robot
76ba344af6 Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb am: 27d3d5cbdb am: 90903040e9 am: 34d651756c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453

Change-Id: I17cad2e2475690ee8c20f723604ce0646ff1febd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:53:08 +00:00
Bill Yi
8ff4fc8689 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9 am: 3190e40a71 -s ours am: 23cdeae286 -s ours am: 64ee29c99f -s ours am: 10fe65b769 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie7de15cfabb1da5d3abc4915d39147b7fc34d813
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:53:05 +00:00
Bill Yi
ee03d0172d [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours am: 74fc91b313 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8f47508a38cd60aba21309f166970901d42a13e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:47:10 +00:00
Bill Yi
4dd803da1d [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours am: fdcf2eed39 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84b054daea4ece17be364b6a405650ed9d3af04a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:46:27 +00:00
Lucas Silva
fd0e2b04e4 Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24 am: 4e8e70869b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536

Change-Id: I8e95e0f4ea4959d14cd89c397d986ddac2c69046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:40:37 +00:00
Lucas Silva
1333451d6d Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24 am: 336f4991af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536

Change-Id: I8c5725d8fe6dad32fdeb3fd79658d366fe11bd32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:37:48 +00:00
Josh Hou
3357df6940 Merge "[Panlingual] Screen title is displayed incorrectly" into tm-dev am: fc0033fa2e am: e3281e01b7 am: 72ded649e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17631064

Change-Id: Ief0d3ebb6c88c9d181f07a039bd0fc037abbb3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:21:16 +00:00
Lucas Silva
4e8e70869b Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536

Change-Id: I2623a62e2b83df6816ada4998951e38a4c8d8f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:15:39 +00:00
Bill Yi
74fc91b313 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours am: 6df1ae4e5f -s ours
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I8ccdc0914ae332731dbc24330bb7d42b05356ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:14:45 +00:00
Bill Yi
fdcf2eed39 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours am: ee5c8c915e -s ours
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I24893b4908756aceef98fd3edf3ed0d68e5c27ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:14:30 +00:00
Lucas Silva
336f4991af Merge "Always set the customize button in dream settings to not selected." into tm-dev am: 8604694b24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17638536

Change-Id: Ibeb86a0c80fb46afccc2f07b681251efacc62e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:13:54 +00:00
Bill Yi
6df1ae4e5f [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: c854c108a2 -s ours
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: I50b41ddcca4b5d93a80d7cb274c7bc6aee8e97cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:31:36 +00:00
Bill Yi
ee5c8c915e [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 35525a5617 -s ours
am skip reason: Merged-In I2a97159d0de32a6262bbace7bb82b09897447bdb with SHA-1 e75d9ee3e9 is already in history

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

Change-Id: Iae1f5f9c4b22fdd8aa1e82185a64c07d8c65a979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:31:20 +00:00
Lucas Silva
8604694b24 Merge "Always set the customize button in dream settings to not selected." into tm-dev 2022-04-08 18:27:38 +00:00
TreeHugger Robot
5ba74416d0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443 -s ours am: 191b3c66f4 -s ours am: f558466b83 -s ours am: 3b05e2f8b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib93e15074374009c92497587818a01a8d17d32c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:11:54 +00:00
Bill Yi
d0928c1448 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace -s ours am: 6d933dc234 -s ours am: 405720d804 -s ours am: ee310db504 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic35fd2a01f4f6a3aa503533edce3e74e87548abd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:11:53 +00:00
TreeHugger Robot
c05fc2b3ef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb -s ours am: 71308f95e1 -s ours am: 4470dcd6c6 -s ours am: 2583880780 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic365fe83a00c0940d72aa5f77ea8c95b6c11898b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:10:37 +00:00
Bill Yi
c854c108a2 Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:25 +00:00
TreeHugger Robot
fe0a9b25bd Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb am: 27d3d5cbdb am: f220363676
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453

Change-Id: If11b36783ccebbaaabadd50057e8c39248ab27e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:06:31 +00:00
Bill Yi
1831141062 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9 am: 3190e40a71 -s ours am: 23cdeae286 -s ours am: 3d4c6cd1b1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6f9cbf54e582c3a9c35a3877fe24e670e31b603b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:06:29 +00:00
TreeHugger Robot
35296bf106 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443 -s ours am: 191b3c66f4 -s ours am: f558466b83 -s ours am: 3e5d657d70 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2f9b3c4ede8fc5b8c8d5bf34812ac8d7b1ca5ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:54:06 +00:00
Bill Yi
4c2c0c8058 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace -s ours am: 6d933dc234 -s ours am: 405720d804 -s ours am: f2ee75af93 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7d682571c8c340773cb461cebbd78151f2d146d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:54:05 +00:00
TreeHugger Robot
93af59105a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb -s ours am: 71308f95e1 -s ours am: 4470dcd6c6 -s ours am: 8fca0e1e69 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia889fdc145e837adb972f2e6ff7198a154885fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:53:35 +00:00
TreeHugger Robot
34d651756c Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb am: 27d3d5cbdb am: 90903040e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453

Change-Id: I9774a0d8f1c2423384c89fab92ed5d46462f56ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:51:40 +00:00
Bill Yi
10fe65b769 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9 am: 3190e40a71 -s ours am: 23cdeae286 -s ours am: 64ee29c99f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id7058879d1b5c9df1e9d6ed3ce6a84f5d30f2618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:51:39 +00:00
TreeHugger Robot
3b05e2f8b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443 -s ours am: 191b3c66f4 -s ours am: f558466b83 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iffe1ae469f50aa316530478d03d198f274b4b3c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:32:25 +00:00
Bill Yi
ee310db504 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace -s ours am: 6d933dc234 -s ours am: 405720d804 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib0e96bf0e75565b9d46aeb326dceaa1af79bb6c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:32:22 +00:00
TreeHugger Robot
2583880780 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb -s ours am: 71308f95e1 -s ours am: 4470dcd6c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8f66f9e5ddc4c6415246224787b6ed0bb293059b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:31:26 +00:00
TreeHugger Robot
3e5d657d70 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443 -s ours am: 191b3c66f4 -s ours am: f558466b83 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I40930b9b7e3bc7cecca9a2550cd113a202f6a870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:30:03 +00:00
Bill Yi
f2ee75af93 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace -s ours am: 6d933dc234 -s ours am: 405720d804 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iac8237d219de0f28af2f6eb9d8193b001b5aaf54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:30:02 +00:00
TreeHugger Robot
8fca0e1e69 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: e07b5149fb -s ours am: 71308f95e1 -s ours am: 4470dcd6c6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If9beaf5fe910d8d36ee00dcdf2c8e03cc2919925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:28:50 +00:00
TreeHugger Robot
90903040e9 Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb am: 27d3d5cbdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453

Change-Id: Id69fd6f3072a9d2daef15262ec5a168d57813cb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:27:39 +00:00
Bill Yi
64ee29c99f [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9 am: 3190e40a71 -s ours am: 23cdeae286 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I646c34809d130c8c8beac4fbc0199d6c3b7257e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:27:38 +00:00
TreeHugger Robot
f220363676 Merge changes from topic "presubmit-am-70a8544d6ed24ad4939a6cf49ab652fd" into sc-v2-dev-plus-aosp am: dd199c11cb am: 27d3d5cbdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17625453

Change-Id: I777bcc549974a047c83a306dc294a6196487a4a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:27:13 +00:00
Bill Yi
3d4c6cd1b1 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2b07fb08f9 am: 3190e40a71 -s ours am: 23cdeae286 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic152ed1589b8eaf263bd65b4fb1bbeef173d3678
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 17:27:09 +00:00
TreeHugger Robot
f558466b83 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0e17e61443 -s ours am: 191b3c66f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idbe24cff535f3591b26a033aa4ddb643c81c0854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 16:42:52 +00:00
Bill Yi
405720d804 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 32d0a9eace -s ours am: 6d933dc234 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1461c43cfe5f811cc80b212d9dd487fe96b296b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 16:42:51 +00:00