Commit Graph

111379 Commits

Author SHA1 Message Date
Amy Hsu
280e8b686d Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 am: 7e0b5c8c07 am: d68c5cd23b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: I7194ed2a947aa0943813dc600fae44d5fca807d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:31:24 +00:00
Amy Hsu
d68c5cd23b Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 am: 7e0b5c8c07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: Id864846262cc794add2694833e6618d770409dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:21:36 +00:00
Amy Hsu
7e0b5c8c07 Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: Ie88b0db9abc05339c9c77aa87350bcd3acf963e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:11:31 +00:00
Amy Hsu
be6fef3095 Merge "Restore the density when it has been overridden" into tm-d1-dev 2022-06-15 05:31:43 +00:00
TreeHugger Robot
1161c9ed5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours am: 2fc7ce6a84 -s ours am: 7eed66e60f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c53eae1e586f1b7ef7b15ee1b9358ad900e2836
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:52:19 +00:00
Bill Yi
9213ae1a7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7 -s ours am: b70ab5079e -s ours am: 11de0c2aea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6393f283be968c566ad2a474b7fc94bb7871b260
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:52:08 +00:00
TreeHugger Robot
7eed66e60f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours am: 2fc7ce6a84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4377de7bdd8de4a2532807b90f8bdbe1a49e8107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:42:21 +00:00
Bill Yi
11de0c2aea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7 -s ours am: b70ab5079e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d5286c23d1e35a4a87c5014d3b2c26e8072077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:42:00 +00:00
TreeHugger Robot
0c89b33fae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours am: eb1d552ac2 -s ours am: f8a6212443 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3594742e95b30a33cee848517178b99eddb158d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:35:37 +00:00
Bill Yi
9a1f81b79a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7 -s ours am: 88d6e11c70 -s ours am: ff73c31f01 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8ce5645a70cadcd31e05e60ffe32a3bac71a5ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:35:24 +00:00
TreeHugger Robot
f8a6212443 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours am: eb1d552ac2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c71be2de6a8395a77116f0202e0ea8b793a5a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:26:17 +00:00
Bill Yi
ff73c31f01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7 -s ours am: 88d6e11c70 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I542864da7a2aa0143e8844cf622d50a51e9b099d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:26:08 +00:00
TreeHugger Robot
2fc7ce6a84 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iecbe81c431b6cc04486495437b6371eaded44fec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:22:35 +00:00
Bill Yi
b70ab5079e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1312de156a5f5507c3a041c1c1df699949cf55e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:22:16 +00:00
TreeHugger Robot
eb1d552ac2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b10e291ea2bf756c3cc9d25f5f222d34f2515de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:21:08 +00:00
Bill Yi
88d6e11c70 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia45c913ef45c94283d56c7952668f26cbf27b721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:20:48 +00:00
TreeHugger Robot
838099408b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-15 01:08:49 +00:00
TreeHugger Robot
415a2279fe Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 8d3f1ccf73
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163

Change-Id: I7ff698d590de971c03075dc931d483f3a4038e39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 22:40:34 +00:00
TreeHugger Robot
f3d35a2f68 Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: 668d6e9451
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360

Change-Id: Ia6e352a2aa9a2b8bdb5d439810eec691dd49a9e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 22:36:04 +00:00
TreeHugger Robot
0c5bca0c67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: d097786212 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I19682c819e7690c50720539108e3ce1f739f1a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 22:21:27 +00:00
Bill Yi
c8ed2e3f92 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 89c2a974eb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib61a2f5506b1c6b46c5b8acf765a1f92d14dadd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 22:21:13 +00:00
Bill Yi
2212112f30 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: 49df98360d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b551750c1a0a6509797b4d31848b9a6cb10de91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 22:20:57 +00:00
Bill Yi
5c28c33b2a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: 61dfaa8065 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ac4751d8c619a92af1b010ce608037798db5bf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 22:16:50 +00:00
Bill Yi
8f5371d4fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: eddfa90d93 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0e90e92937e6e5d4d55bf790d02304d49f0d0d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 22:14:15 +00:00
TreeHugger Robot
519734e1c6 Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 5cee947b85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456

Change-Id: Ife45070814853c6714fddeac0fd49fbe091e9e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:54:34 +00:00
TreeHugger Robot
a553a946f6 Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 2d24ac94d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: I043f8a3a5952df690e53ebf3d3acdd90d86b54d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:54:27 +00:00
Joshua Mccloskey
d7a6bcb32a Merge "Updated FP enroll confirmation string" into tm-dev am: 75313dcb5d am: 0d439eeb07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18801434

Change-Id: Id2bbbb3aed91a7551677456986d703475e4d2007
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:54:20 +00:00
TreeHugger Robot
d79b094af6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2b662c5a07 -s ours am: 87adc961e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I536fe2aeddc93c3c0eeb416c2c6ecce34dced3d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:51:47 +00:00
Bill Yi
4512401100 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5391d591c8 -s ours am: 405f70fe8b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17fb67951f5245461d1955d3aa067523a815adc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:51:41 +00:00
TreeHugger Robot
588e8c0f11 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 71826af4fb -s ours am: ce888654ce -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1c46c86e8f6fbb05dc2905914a905941cbeecd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:51:30 +00:00
Bill Yi
b0de4654d3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c1ebda67c2 -s ours am: 24abd3d65e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a815d008305d81d0095b0912520769f4c8c3156
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:51:22 +00:00
TreeHugger Robot
f8f65956dd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: de8ca411e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c25c2fe3b628f30f5d5eaa9d0763c957d305e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:48:55 +00:00
Bill Yi
2e58713a91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5b60c230a4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3f2a3a5fcdcd76a7048e68fe7260b88913735fd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:48:50 +00:00
TreeHugger Robot
b22d87c23f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 9859bf8cd7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia48a7e4c669897f1bdaf5e0c1066bf8f94c83eb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:48:44 +00:00
Bill Yi
1f2ac8eb56 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd63a8e6e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I00dcf2e4d6395e93f8622ff0f3e9910e779f61e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:48:35 +00:00
Jason Chiu
c1ac88c417 Revert "Do not show the redundant RemoveAccountFailureDialog" am: 7f1ff1b796 am: 8d1a290b23
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802568

Change-Id: I6921e52c01e223d1858e15460292794b6c49eb98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:30:47 +00:00
Piotr Wilczyński
748fd6bcf5 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 471831c309
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I1929f40245781684976380a5c9373e92110c620d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:30:36 +00:00
TreeHugger Robot
34270b07b4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b18d91f718 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icc4121ccc067d36e197fa6ec908a6ad426b99439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:21:08 +00:00
Bill Yi
4dcc0cfc7f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: bae003932e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I41e1c148bf2bca5462570375c4bfec9077f5e94b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:21:01 +00:00
TreeHugger Robot
90786c38a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 259a096de4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If7ca077d96a23d687545369ba30f4091faa30eeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:20:49 +00:00
Bill Yi
8921969087 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 28e9f3fed0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb748fe4b7bf448e2dcbf3e541be886e354a26b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:20:40 +00:00
TreeHugger Robot
7bc407da79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f700b7398c -s ours am: c74ba215e1 -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: I05dfb2748219448ac86c68a8145dab6bc63ea42b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:15:39 +00:00
Bill Yi
97c90071d8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d98e536863 -s ours am: 1dc3bda569 -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: I3ef4b1c85578d611b4e07dcafebec368e0f2a928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:15:34 +00:00
TreeHugger Robot
e4d5beefb4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 8be819762f -s ours am: 97f3c2d264 -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: I09fa43c486c746afad66dc5d9bb5d292e54053fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:15:27 +00:00
Bill Yi
b6353940a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe71b2e76c -s ours am: 86a359f724 -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: If626311ce6a0d16366bdb12531f687a481781320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 21:15:18 +00:00
SongFerng Wang
ed4d1eb3a8 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 2ab5c395ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: I969829dad347b5436d91614fa391babd0b2cf571
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 20:36:01 +00:00
SongFerngWang
4c301a1008 [Setting crash] The dialog is null am: 8514ff65eb am: a49335241a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18792471

Change-Id: Ibb287f55407f58a3999361b726cf9909346e1852
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 20:35:53 +00:00
Bill Yi
443fef15a1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 477cf091a1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5c6293037e94372d1233585d9ef35d10defbc597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 20:35:43 +00:00
SongFerng Wang
db6c2b7af3 Merge changes Idf0ce198,Ibd324b78,I6daa38f5,I242402e4 am: 8be3ebd163 am: a5a729f523 am: 95f153642c am: 3d14d61621 am: fa5a7f19dc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2121199

Change-Id: I3a97b5f666c36647b58f00086b48c7b8e1e8f8bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 08:18:28 +00:00
SongFerngWang
0989c696a0 [automerger skipped] Unable to enable the removable esim am: 56e1297abe am: fbfaa331d2 -s ours am: a5ddd89091 -s ours am: 879118669a -s ours am: 9231789a8a -s ours
am skip reason: Merged-In Ibd324b781c84318c994e3742bb82e1d1393b94e4 with SHA-1 64430ba2d2 is already in history

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

Change-Id: Ib60fffa482acda0fe47db1e12a8eb63ea84d2cd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-14 08:18:26 +00:00