Commit Graph

101910 Commits

Author SHA1 Message Date
TreeHugger Robot
e23c8f1689 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours am: 18bdecad94 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8715452e0a3d627dd01eea156af17c2afd1bb913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 07:33:59 +00:00
Bill Yi
481bdb2265 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours am: 3d34896214 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib3c055fbd1fd16499e0238a6774e504d4b039073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 07:33:57 +00:00
TreeHugger Robot
18bdecad94 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours am: f6bc991eca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8793bb8cecefada63074542b428549ca222330b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 07:17:13 +00:00
Bill Yi
3d34896214 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours am: 772b675c21 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I97e9045aa6b5e9c5928968f3998e57d458ef1942
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 07:17:11 +00:00
TreeHugger Robot
1a01f1b93e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0aa436da2b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67d14af8f03da2bdd4edbc5d5261f812489e86ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:18 +00:00
Bill Yi
9b908935b2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f0622598ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9490a0b0eba197d8f16c537d5980636839bf6d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:47:17 +00:00
TreeHugger Robot
f6bc991eca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 6a8dbf49bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifcf3abb8947dddfdf7db01c7ed7a7a8fb8b95042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:45:50 +00:00
Bill Yi
772b675c21 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f89aa3ca1a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2141797b3768ad979ff4dd600687ec17e4b28a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:45:41 +00:00
TreeHugger Robot
0aa436da2b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 06:41:44 +00:00
TreeHugger Robot
6cf3ba6730 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cb8148ebaf -s ours am: f8cae93b6e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idf77a706bd988d57c318fa99d953941bc97bee1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:33:59 +00:00
TreeHugger Robot
579f0df02b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: abd1a29b60 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I758a6b99732b4652b18c2534579adae5e47d655a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:32:27 +00:00
Bill Yi
60089ac6c2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 29510c162d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I618bcafe2e96012984d2fd60c1091f4bd6cdaf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:32:25 +00:00
TreeHugger Robot
f8cae93b6e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: cb8148ebaf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I81954c4e9a931190a8b683014396ddf5da8b35b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:31:57 +00:00
TreeHugger Robot
abd1a29b60 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-11 06:26:16 +00:00
TreeHugger Robot
068af6fb61 Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-dev am: 652b9f46bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17675004

Change-Id: I7627e040fc195210b4395d800664941e6dceae8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:24:11 +00:00
Bill Yi
29b997cff3 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946 am: 7f2b0a3e06 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0456bbb51045aa5c55681b4baa3bf66f90485655
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:24:09 +00:00
Bill Yi
b4736f8091 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745 am: 7df6d79353 -s ours am: 80f9c4f88d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6338b595aa84241c097caed315e6d3857b319d13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 06:23:58 +00:00
TreeHugger Robot
6a8dbf49bd Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2022-04-11 06:23:57 +00:00
TreeHugger Robot
cb8148ebaf Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-04-11 06:05:47 +00:00
TreeHugger Robot
652b9f46bc Merge changes from topic "presubmit-am-86b67679f79a443d894e334b04855145" into tm-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946
  Import translations. DO NOT MERGE ANYWHERE
2022-04-11 06:05:47 +00:00
Bill Yi
80f9c4f88d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745 am: 7df6d79353 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I886e3694aeb948d9f851335978c429dc62e2620c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 05:59:26 +00:00
TreeHugger Robot
e2d4b7826f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-11 05:04:23 +00:00
Bill Yi
82d1785a97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8acb20ea2a -s ours am: de1870ffed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2ae3f8513dcb028126b3eab8f2d460244f089cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 05:02:27 +00:00
TreeHugger Robot
654ebdd746 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-04-11 05:01:05 +00:00
Bill Yi
de1870ffed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8acb20ea2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I37b8fab4a16c5e5f94266bd46f41f7a814bdfe13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 04:47:20 +00:00
Bill Yi
f89aa3ca1a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I21a2962c5ae08b820a33b14a9a2c0243776cf792
2022-04-09 13:30:52 +00:00
Bill Yi
57cee05ab4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic0f60a7c13fb500763381b24d10af9e1ffd2f7b2
2022-04-09 13:26:57 +00:00
Bill Yi
7df6d79353 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a8dc008745
Blank merge reason: commit message contains skip directive

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

Change-Id: Ied5fd9d22e8a7567f921d24c344a6419ccf1fbbe
2022-04-09 13:15:09 +00:00
Bill Yi
a8dc008745 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic7c984e8829ae72309c1fc673d8b5efda52cac25
2022-04-09 13:15:01 +00:00
Bill Yi
8609572f5a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8806744519a2062a85a4bd3579604ee99afdf814
2022-04-09 13:13:23 +00:00
Bill Yi
8acb20ea2a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8ec8d124d01075b528fe637783670daccb2da3cf
2022-04-09 13:07:19 +00:00
Bill Yi
7f2b0a3e06 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4beecb6946
Blank merge reason: commit message contains skip directive

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

Change-Id: I9121da491000a804d91723b6e13ee9d2a74f82c2
2022-04-09 13:03:55 +00:00
Bill Yi
4beecb6946 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ia56e96f0f7b667a6811440e12e3caab7dee7548e
2022-04-09 13:03:44 +00:00
TreeHugger Robot
66903e1328 Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev am: 3ed73b7b2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17630131

Change-Id: I2535c12e487cce2beb462995f0abda80415cf626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-09 09:22:00 +00:00
TreeHugger Robot
3ed73b7b2d Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev 2022-04-09 08:59:05 +00:00
Bill Yi
29510c162d Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib43c040ea78198a02e3a405c9d3814af1927458f
2022-04-09 04:37:46 +00:00
Bill Yi
f0622598ef Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3cc4c934e8fe86a45c45dc1d62aab78a30585529
2022-04-09 04:34:41 +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
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
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
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
Bill Yi
c854c108a2 Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" 2022-04-08 18:08:25 +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