PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,023 Commits 1 Branch 0 Tags
bd15e7f64a89c78f4a39046e7c3cc2c7672a7332
Commit Graph

111023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chiu
bd15e7f64a Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 6780e6ffdd am: f26f49a789 am: 7a929f8c29 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: I81feb5339e0ee419a8652e75568610e55b4f9ce8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 03:33:14 +00:00
Jason Chiu
c2ba8566ad Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 4ec1953a82 am: 80f4582723 am: ed07da032a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: Iafe5b31154ded0b325e3a07efa121adffa94211c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 03:33:06 +00:00
Jason Chiu
7a929f8c29 Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 6780e6ffdd am: f26f49a789 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: I57c831f2512ef26ab2d217bbc24ac642732cc9ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 03:06:12 +00:00
Jason Chiu
ed07da032a Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 4ec1953a82 am: 80f4582723 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: I64e5ba41e0bb3deec4607b6642e0f640a8e29f8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 03:05:58 +00:00
Jason Chiu
f26f49a789 Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 6780e6ffdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: Ie8d2fc2fd39a72e6057d1cab6919dbd8c93a91e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:51:13 +00:00
Jason Chiu
80f4582723 Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 4ec1953a82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: I46c865b8c61b359254ea8e971c26b0faf09a8dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:51:11 +00:00
Jason Chiu
4ec1953a82 Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: Idf47ad68dd184cf45ce467eeb6be12a30e8c3057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:34:59 +00:00
Jason Chiu
6780e6ffdd Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: Ied9c640a9a3586efa78eb1456234cbfac44904fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 02:33:22 +00:00
Joshua Mccloskey
477ee6e456 Merge "Clear FP error only on progress." into tm-qpr-dev am: 6947d508e8 am: 71ca81a039 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18721503

Change-Id: I8b0564ac9669a4c52c67c332378473c0c26511c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 16:32:42 +00:00
Joshua Mccloskey
1c19c2e8bf Merge "Add functionality to restart fp enrollment." into tm-qpr-dev am: 81224f09e3 am: 0295bc2285 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18788040

Change-Id: Idc4ab9e97b8e8cf978a8139e67976cd015091684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 16:28:56 +00:00
Joshua Mccloskey
71ca81a039 Merge "Clear FP error only on progress." into tm-qpr-dev am: 6947d508e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18721503

Change-Id: Ie7ca8f13d8f644ea03ff90a5c5a05f41f4536a84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 16:09:38 +00:00
Joshua Mccloskey
0295bc2285 Merge "Add functionality to restart fp enrollment." into tm-qpr-dev am: 81224f09e3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18788040

Change-Id: I0188ab24c487cc569645d1b07dbb25c94024df4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 16:09:27 +00:00
Joshua Mccloskey
6947d508e8 Merge "Clear FP error only on progress." into tm-qpr-dev 2022-06-09 15:58:45 +00:00
Joshua Mccloskey
81224f09e3 Merge "Add functionality to restart fp enrollment." into tm-qpr-dev 2022-06-09 15:37:53 +00:00
Piotr Wilczyński
7c9eb92300 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 8bfab753c1 am: ccb82954c4 am: f73f814ce7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: Iadd3f84681a26e6e06dc5894b23c663c8b474410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 10:53:18 +00:00
Piotr Wilczyński
a0eb3b2124 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 395861f79d am: 7018bd6f69 am: 74f809f766 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: Ib8c11b9e11c93da53ea1b355187232e9ad546b82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 10:53:01 +00:00
Piotr Wilczyński
7375626332 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 8bfab753c1 am: 6dac1ca43d am: 179f00b9ef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I1bd33756b3f0ff484e97d18b1536899760fc8166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 10:52:42 +00:00
Piotr Wilczyński
f73f814ce7 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 8bfab753c1 am: ccb82954c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I88e081235c447e4bd6490647da9c7ab8467fb2f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 10:35:39 +00:00
Piotr Wilczyński
74f809f766 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 395861f79d am: 7018bd6f69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I1f5c54ac22aae1b839b54edfa568225837da9d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 10:35:23 +00:00
Piotr Wilczyński
179f00b9ef Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 8bfab753c1 am: 6dac1ca43d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I0bad5912a12ae7fb19dd84b26a8cc9328ee99e46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 10:35:14 +00:00
Anna Bauza
ab64c52f7d Merge "Fix "Turn on phone calls" for guest user" 2022-06-09 08:46:38 +00:00
Piotr Wilczyński
ccb82954c4 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 8bfab753c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I5e7743cbeb5f6a39f2e2251eb52051a9f00dfcfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 08:19:47 +00:00
Piotr Wilczyński
7018bd6f69 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 395861f79d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: Iba1f3f42b53b58216d66747b9ccb614b9cdefd28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 08:19:39 +00:00
Piotr Wilczyński
6dac1ca43d Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 8bfab753c1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I74d279c286d697f13af2059e0c93f3c3109a7f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 08:19:37 +00:00
Jason Chiu
7f1ff1b796 Revert "Do not show the redundant RemoveAccountFailureDialog" 
This reverts commit e5f1d24913.

Reason for revert: "Remove account" does nothing and shows no errors
Fix: 232819214

Change-Id: I4a4e5084cde87ea2a9e5be1ff3ca6709e11ebc3d
 2022-06-09 08:14:13 +00:00
Piotr Wilczyński
8bfab753c1 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I00e339ffd5b02bcbfeccb512eeeedf6d6356df76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 07:59:40 +00:00
Piotr Wilczyński
395861f79d Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: Ib7e8232d1f4dafa6418363e629ba228d1eb217e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 07:58:03 +00:00
Piotr Wilczyński
7d634de3ea Merge "Notify about brightness change when screen turns on" into tm-dev 2022-06-09 07:39:07 +00:00
Automerger Merge Worker
a2804e7123 Merge changes from topic "am-48b99c33710f4307b5bcefa2db7cb9a2" into tm-d1-dev-plus-aosp am: 51b13dd95b am: 224aaac5da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801444

Change-Id: Id9623c17cdab30d111168ddd445bc9ecce94ce9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:48:34 +00:00
TreeHugger Robot
22f0b99896 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: 7d9636054e -s ours am: 871b4f2c44 -s ours am: c3f884cd78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia180c1658c2b2eab92b59cdd618c71284bb8b5e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:48:25 +00:00
Automerger Merge Worker
d03e69db92 Merge changes from topic "am-2bf538dca34746eb9710be3e2ab1743e" into tm-qpr-dev-plus-aosp am: 601b4fc432 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801444

Change-Id: Id4afbfaddc1fed6dde803ea88a64ee8ee9716d0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:46:36 +00:00
TreeHugger Robot
a8fc4d578e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: de2f136db2 -s ours am: 2b4cbd1b27 -s ours am: ca13912b66 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4f2434632fd9989ebc410f19bd940aea606f33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:46:27 +00:00
TreeHugger Robot
48298ac580 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: de2f136db2 -s ours am: 2f544f0fd9 -s ours am: 4a9c341481 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie94854a72d7523db7efcb09239e7cd3c32416b2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:41:36 +00:00
Bill Yi
00aa3d4465 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours am: ddb8e910fd -s ours am: c9f3dc253e -s ours am: 5a28160c63 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I24edd449243c49df15499c76f268299103bcdb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:41:33 +00:00
TreeHugger Robot
00040830fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 8c54572db8 -s ours am: 495824f000 -s ours am: 6d8bc62563 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3b21ee9fde95ab63cf14983d45cf7762e28da6bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:41:24 +00:00
Bill Yi
a01eca7cb5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: 7e372d0d7b -s ours am: 2b3c76edef -s ours am: 3e1436b719 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia07ae61a170b5ac78b64b7ed999c580ea1268d24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:41:14 +00:00
Automerger Merge Worker
224aaac5da Merge changes from topic "am-48b99c33710f4307b5bcefa2db7cb9a2" into tm-d1-dev-plus-aosp am: 51b13dd95b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801444

Change-Id: I474cecc43a40e0463057c14a9621f7263bed2e12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:09:43 +00:00
TreeHugger Robot
c3f884cd78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: 7d9636054e -s ours am: 871b4f2c44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I51e26d272815df64326b72a4cbe298694e7b3a9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:09:32 +00:00
Automerger Merge Worker
601b4fc432 Merge changes from topic "am-2bf538dca34746eb9710be3e2ab1743e" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: de2f136db2 -s ours am: 2b4cbd1b27 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours am: ddb8e910fd -s ours am: 319f733940 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 8c54572db8 -s ours am: 8bb6bc8a0b -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: 7e372d0d7b -s ours am: f28e3def27 -s ours
 2022-06-09 04:08:02 +00:00
TreeHugger Robot
ca13912b66 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: de2f136db2 -s ours am: 2b4cbd1b27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e16172d1a8f7f6cae9ab500302e408e085c69c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:07:30 +00:00
Bill Yi
ec1bc7adf3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours am: ddb8e910fd -s ours am: 319f733940 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I00be9400d76ae5c5ded1eccf8f8010a6e7f138ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:07:27 +00:00
TreeHugger Robot
13adc84dad [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 8c54572db8 -s ours am: 8bb6bc8a0b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a2098b8b55ae746916df56e19f8ca9798eaca12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:07:17 +00:00
Bill Yi
033ffbf284 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: 7e372d0d7b -s ours am: f28e3def27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0073cdc726c624359537abd066362da9703ba268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:07:07 +00:00
TreeHugger Robot
4a9c341481 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: de2f136db2 -s ours am: 2f544f0fd9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie946db217ed85ee18b053457b48c1cbe71757b8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:06:36 +00:00
Bill Yi
5a28160c63 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours am: ddb8e910fd -s ours am: c9f3dc253e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I09f190bdc20c10361d448d69d57100b989004ac3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:06:32 +00:00
TreeHugger Robot
6d8bc62563 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 8c54572db8 -s ours am: 495824f000 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie881e1be660cac73c203c885fc6830e0abd7f32b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:06:22 +00:00
Bill Yi
3e1436b719 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: 7e372d0d7b -s ours am: 2b3c76edef -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0871cba0ac10e0f61b758bb0f7e587a6ef1f1e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 04:06:12 +00:00
Automerger Merge Worker
51b13dd95b Merge changes from topic "am-48b99c33710f4307b5bcefa2db7cb9a2" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: 7d9636054e -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours am: 1ad8ccd199 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 72a681dbe4 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: a658060c06 -s ours
 2022-06-09 03:46:28 +00:00
TreeHugger Robot
871b4f2c44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: 7d9636054e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7be21f13dd053d66b617ab61860c3d28cf317cfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 03:46:05 +00:00
Automerger Merge Worker
42095b9fef Merge "Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 40379dd9d4" into tm-d1-dev-plus-aosp am: 955397f7ca am: 8d8064671b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: I19642fc5dbe8c6e2da5c1763ad3607efea4edc63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-09 03:46:03 +00:00