Commit Graph

106117 Commits

Author SHA1 Message Date
Lin Yuan
2dc1423904 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 246f5e231c am: f6218e619e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: Ia7a56ebe7e4e03c5b74e57c9a20bdbffa4ebfa19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:16:48 +00:00
Lin Yuan
948a529709 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours am: 8cbda65d7c -s ours am: 850787f791 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifa64fde88447958f6bff33c9140602c65500a213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:16:40 +00:00
Lin Yuan
464a1e22fe [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours am: 62d47086be -s ours am: 00898def8d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I840a1e624f8b042f702585e55e3442f01f8d7f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:16:39 +00:00
Lin Yuan
3e98f84142 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27 am: 3a5519c641
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I3320256ccae1920072a73f85958cad355dd01b3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:16:03 +00:00
Lin Yuan
34fa54abb7 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours am: 9270941726 -s ours am: 2711034807 -s ours am: f4631f9055 -s ours am: c4343439b3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3294c5ebb6bfa7363a493c3d81630db1216efefb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:15:23 +00:00
Lin Yuan
d4f3d1fc07 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9 am: 2a017ad0b6 am: 5f8e0a2887
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Ib2e447209e124bafec30ff384f1eadd1c3f3028c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:15:15 +00:00
Presubmit Automerger Backend
328cc73ecf [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours am: 5c94d6a6f3 -s ours am: 24e76bd184 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c2237e859cb813e7044995346b6eb96bb3a2cb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:15:14 +00:00
Lin Yuan
513e47879a [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours am: 8cbda65d7c -s ours am: bd58e26c2f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55eae2416c716410e55b74b2b191466f47baa61e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:15:02 +00:00
Lin Yuan
5ad09828dd [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours am: 62d47086be -s ours am: 660132025e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I000afc774854cdbdb892fa6ea600d632fd2c1c8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:15:01 +00:00
Lin Yuan
1577081f44 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27 am: d207ad5b48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I416b58f263fbef13f71cf26905d4fdd27d1b5f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 21:14:53 +00:00
Lin Yuan
c4343439b3 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours am: 9270941726 -s ours am: 2711034807 -s ours am: f4631f9055 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id663db32efce381274347d96c65fe7c7ed0ee049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:19 +00:00
Lin Yuan
5f8e0a2887 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9 am: 2a017ad0b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I949bf3f5ff0ed34e9d26768b7198d3fd02dbcf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:13 +00:00
Presubmit Automerger Backend
24e76bd184 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours am: 5c94d6a6f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6ac53f7b3c2c818e7e546c1d0c6011d25c9b53bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:12 +00:00
Lin Yuan
f4631f9055 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours am: 9270941726 -s ours am: 2711034807 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e29973cdd036d806869702e379f4bd48f227960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:54:03 +00:00
Lin Yuan
f6218e619e Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 246f5e231c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I2684c69c3ed3aa1dc5705aaaf83e6c8c9e08d0ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:58 +00:00
Lin Yuan
2a017ad0b6 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639 am: 6ff218c0d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I5b9a01ba9fd0fcabfb9e64e555b49861312b67f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:57 +00:00
Presubmit Automerger Backend
5c94d6a6f3 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours am: 92e30fd1aa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I80bebaf1553833c11d2daa03bb168dcf2bcfc5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:56 +00:00
Lin Yuan
bd58e26c2f [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours am: 8cbda65d7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1b46ae9ad9db4e88c85a52d6b1d8f9f9b929090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:50 +00:00
Lin Yuan
850787f791 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours am: 8cbda65d7c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36918b6369a7ae87340f028ea8ea6563696d25aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:49 +00:00
Lin Yuan
00898def8d [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours am: 62d47086be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1daa9c2e22b5dd6b155aa5863c099ce2df007046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:48 +00:00
Lin Yuan
660132025e [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours am: 62d47086be -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3b8757623664ae94b11a856bcf8afc1de80ca9f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:48 +00:00
Lin Yuan
d207ad5b48 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I8f27d54b9b621968ad7e09916a42d028473cb68f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:24 +00:00
Lin Yuan
3a5519c641 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9 am: 86c609fc27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: I6781439a7517adeaaddbc0b8d22fbd74c4f984aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:53:05 +00:00
Lin Yuan
2711034807 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours am: 9270941726 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1511a2756ab39662081a8bf3386b591c07296cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:41:14 +00:00
Lin Yuan
6ff218c0d9 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46 am: e8887ee639
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Iffa9b63e7676c4d2539c2cda1beb130b27091b4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:41:05 +00:00
Presubmit Automerger Backend
92e30fd1aa [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours am: 128d5ad006 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b3a99a0e8a50c5bb1032c8240bf936281e240ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:41:01 +00:00
Lin Yuan
8cbda65d7c [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours am: cf07afd1a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2eeaf1d6dace35bed73932d26a4c8c71d9db3392
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:35:39 +00:00
Lin Yuan
62d47086be [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours am: db2ea2bcbd -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief7035d92055b44a01b8954153a9939de32d5290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:35:38 +00:00
Lin Yuan
86c609fc27 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: Id0b3a441f5b7cad917f73076a57c15d775496862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:35:01 +00:00
Lin Yuan
9270941726 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa am: 381d6120b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifd2a8bbd74365df0998917bfa360b3148157dcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:34:55 +00:00
Lin Yuan
e8887ee639 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev am: 0920be7e46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: Ib1e30972098ad4a5ba86c1c02092a7d0fc57ac00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:34:47 +00:00
Presubmit Automerger Backend
128d5ad006 [automerger skipped] [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae am: b7ebd6e3a3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4fbb2409a9dd9ef9ad9eef90b135d4ac50636c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:34:45 +00:00
Lin Yuan
246f5e231c Merge "Fix: policy enforcement for location wifi scanning" into tm-dev am: 6ffe64a0a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670858

Change-Id: Icc131e7dd1fee70832aaf4627f806850963c70c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:33:20 +00:00
Lin Yuan
381d6120b7 Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev am: 97c15312fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18670857

Change-Id: I043e7119d2fe281f085ba99ff12759dc588be57a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:33:16 +00:00
Lin Yuan
cf07afd1a6 [automerger skipped] Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev am: 5b0617f569 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5faca0f1d45b2fbc962c507d397a78fb98079f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:33:01 +00:00
Lin Yuan
db2ea2bcbd [automerger skipped] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning am: a12fff673b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3ec9011a5e3bd003773ccb1faffe324f54630ea6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 20:32:58 +00:00
Lin Yuan
0920be7e46 Merge changes from topic "presubmit-am-f27e152dc845437887b1b28993d66b5b" into sc-qpr1-dev
* changes:
  [automerge] RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning 2p: 2598a722ae
  RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning
2022-06-02 19:59:35 +00:00
Lin Yuan
97c15312fa Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-dev 2022-06-02 19:59:35 +00:00
Lin Yuan
5b0617f569 Merge "RESTRICT AUTOMERGE Fix: policy enforcement for location wifi scanning" into sc-v2-dev 2022-06-02 19:59:26 +00:00
Lin Yuan
6ffe64a0a9 Merge "Fix: policy enforcement for location wifi scanning" into tm-dev 2022-06-02 19:59:07 +00:00
Muralidhar Reddy Mule
74c30fff1b Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35 am: 095babe570
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508

Change-Id: Ia61be54cba497230a11efc5c3d53de4cb65620eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:16:07 +00:00
Muralidhar Reddy Mule
5e1da1db62 Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35 am: 8d9c7445a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508

Change-Id: I7e045c9ad7d98430397a7db09ae8439e3e24f016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:15:50 +00:00
Muralidhar Reddy Mule
8d9c7445a8 Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508

Change-Id: Ie6673d39e96342de744f7ffad2bf3f49b8ff1805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:19 +00:00
Muralidhar Reddy Mule
095babe570 Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev am: 77381e7e35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18671508

Change-Id: I7b99e0f0b465f97c2ce6446ac13805da1409a30d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 17:02:13 +00:00
Muralidhar Reddy Mule
77381e7e35 Merge "Adding eSIM option is not disabled if the current country is not in the allowed list" into tm-d1-dev 2022-06-02 16:40:16 +00:00
Automerger Merge Worker
5a1b237f96 Merge changes from topic "am-1a639eaa84504a15988bb274c4f563e8" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf -s ours am: f9c6f838d5 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5 -s ours am: 3369ba127b -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6 -s ours am: f71bb3a8cb -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238 -s ours am: dfe3cc520b -s ours
2022-06-02 14:46:17 +00:00
TreeHugger Robot
1d65bf6b9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 81d673b4cf -s ours am: f9c6f838d5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia256a9927d8999fdc6b9dcd340eef40b5a4fda54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 14:45:52 +00:00
Bill Yi
5888a02f53 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 27b8da05a5 -s ours am: 3369ba127b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida36c3c65b76ff9cf40a90bcf35668c48316e4bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 14:45:28 +00:00
TreeHugger Robot
9acee87e9c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0d203757d6 -s ours am: f71bb3a8cb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1af87a3970d0b1b5e61d1fad97a9efe99dec308d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 14:45:06 +00:00
Bill Yi
55e29911cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cecf7e8238 -s ours am: dfe3cc520b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9fd09a0d13cf77b7fbe0e7785be169d2e3b37d70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02 14:44:45 +00:00