PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
105,534 Commits 1 Branch 0 Tags
a943c509630ff0bbca8b6d85c66ce6ad76e1437a
Commit Graph

105534 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
85705f38d1 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: Iff69fc96ab9fc59b00ca8ef6ff2e4aac35e07dfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 06:19:24 +00:00
TreeHugger Robot
3e1e0cd837 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev am: c28169adb9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17950674

Change-Id: Ib9b86811540faf757fd85061934654b8a94fa36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 06:19:06 +00:00
TreeHugger Robot
c28169adb9 Merge "Revert "[Settings] Code refactor for combining TelephonyCallback with Lifecycle"" into tm-dev 2022-04-27 05:56:10 +00:00
Hugh Chen
035a9dd4e7 Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 07089739be am: 14984ce5ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: Ied8749869e0844f62b6894a370e47762352fb7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 05:30:28 +00:00
Bonian Chen
8789731cde Revert "[Settings] Code refactor for BroadcastReceiver under Lifecycle" 
This reverts commit 81d230b250.

Reason for revert: merge failure in other branches

Change-Id: If8661f5f321f22df96aab54eb8ba967c232348ac
 2022-04-27 05:13:30 +00:00
Hugh Chen
a01f125313 Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 07089739be am: 3aaf35cac1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: Ic0ee1f85167a0673ed4d553de3b913031b19c8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:58:26 +00:00
Hugh Chen
ecb9508fef Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: dcd868531f am: f42f401c1d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I1c5418cadee00311b14e67b53792eef13b7c97a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:58:17 +00:00
Hugh Chen
14984ce5ca Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 07089739be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I8361dee6e24ff2bcc401ad2b235e1a6dd6727380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:45:43 +00:00
Hugh Chen
3aaf35cac1 Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 07089739be 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I5738e71927166b3f5d50cb3df235bde22a36caf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:44:25 +00:00
Hugh Chen
f42f401c1d Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: dcd868531f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I6d63cf33569e84ab04353020d37c92d291014926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:37:12 +00:00
Hugh Chen
681d69b2b9 Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I0d473f7d49bfec4cf179dc670b2c7e74d5e83bf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:21:38 +00:00
Hugh Chen
07089739be Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I9650808a7a8d133a8dd306cb20a2bf03dad860c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:21:31 +00:00
Hugh Chen
dcd868531f Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I392bc8403460c386d7938ce87f523a1187778c65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:20:06 +00:00
Joshua Mccloskey
da01a1b5c1 Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb am: 3fd02b1492 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: I1039a68cc28a81997ed75872248b0e2c46c58504
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:15:52 +00:00
TreeHugger Robot
8838625058 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -s ours am: ae8bd84a09 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic75e2d17dedde1a24e9443cca42f0138ec3e143d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:12:17 +00:00
Bill Yi
aed191087f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours am: a0048fb9cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e6686a0490a0f4b036e9792bbc7b32aa6e9f682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:12:03 +00:00
Joshua Mccloskey
c128e0423c Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb am: 5ba13f2c14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: Ibd6b1621b8f20279178afb6df4582a22edb6e3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:10:27 +00:00
TreeHugger Robot
efc499a2ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -s ours am: 4df4520afd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9aa51da1fa1a11c8d36dbd6bd581281206c4b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:08:32 +00:00
Bill Yi
4aa1d180cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours am: afc0b47d1b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d98f29072da1a0085258ce5273e867433485594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:08:19 +00:00
TreeHugger Robot
e634981491 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 9c9dea5406 -s ours am: 4eef82d108 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4647829f1a73afbd36762a995c2fcf33b1994752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:05:28 +00:00
Bill Yi
d29e5cc4ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: 88e3db5ba2 -s ours am: 4112503af4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1639746b2396b3042dba2e560fd543811918a4fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 04:05:13 +00:00
Hugh Chen
ec5aa12cec Merge "Fix NPE in Bluetooth Settings." into tm-dev 2022-04-27 04:00:33 +00:00
Joshua Mccloskey
5ba13f2c14 Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: I43e4a9ee87f90fa25282cd6498cbc1dac5ce17bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 03:54:45 +00:00
Joshua Mccloskey
3fd02b1492 Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev am: dfc6bd1edb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17917343

Change-Id: I92fb413b68432035cbab2c8ae56cf5102330133d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 03:53:22 +00:00
TreeHugger Robot
4df4520afd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib8bacd0548b88594bec1485a4b312c3144be6d27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 03:51:41 +00:00
TreeHugger Robot
ae8bd84a09 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 4106452f17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5631a445038cf7cf27ba008d2933f84741c14979
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 03:51:27 +00:00
Bill Yi
afc0b47d1b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17da94794bbc6d9f0a2d14d34a5e599e25ed9371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 03:51:19 +00:00
Bill Yi
a0048fb9cf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: ac0f2ae37e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9acc40bf6a14fcfad9eecf3d49fccd3b1af17611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 03:51:12 +00:00
TreeHugger Robot
4eef82d108 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours am: 9c9dea5406 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I336a6a406817b58ac895644289f80c2690cf6d74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 03:42:54 +00:00
Bill Yi
4112503af4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours am: 88e3db5ba2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I70e53b6c9d53214814bc43f1fa46a9e6f1b0cf34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 03:42:41 +00:00
Stanley Wang
031cda05c3 Fixe the problem of invalid switch preference 
- SettingsMainSwithBar will be recreated after the page is resumed.
  We should keep the OnMainSwitchChangeListener for
  SettingsMainSwitchPreference and re-register the listeners after
  the page is resumed.

Fix: 228930107
Fix: 222384287
Test: Manually test and see the UI
Change-Id: I9b57053989e611288cf4814b2a0ecbf9e3c55145
 2022-04-27 03:41:06 +00:00
Joshua Mccloskey
dfc6bd1edb Merge "Fix final UDFPS enrollment haptic." into tm-d1-dev 2022-04-27 03:01:22 +00:00
TreeHugger Robot
4106452f17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd6bfaba93e5a5e0e79046759e9b21f118cd1641
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:56:15 +00:00
Bill Yi
ac0f2ae37e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d774a5c9d3d9cd074e24f25699919a2e7c49029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:55:55 +00:00
TreeHugger Robot
9c9dea5406 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2a71ed5ef40a7abbe1761cb58724c67065a51070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:55:37 +00:00
TreeHugger Robot
5ffb8f9140 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 37c4a74b27 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I877d8a9c3902b81bc5e0c94c4b87b038df6da1b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:55:34 +00:00
Bill Yi
ecb3697aec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3c21b3a8b4098bcb59693e95479b60ea2e7bce4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:55:15 +00:00
Bill Yi
88e3db5ba2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3f51a847ff -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c46ca3849c391c750828976413318d0237dab09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:55:07 +00:00
TreeHugger Robot
37c4a74b27 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-04-27 02:31:39 +00:00
Automerger Merge Worker
36900649d9 Merge changes from topic "am-828d7b02241a4b7fb76fe599192cd666" into tm-d1-dev-plus-aosp am: 7bd6130a60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17933038

Change-Id: Iec7a25e05aa6323384a4c08c84166202584b346f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:18:21 +00:00
TreeHugger Robot
c3d19b2c67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: e26c4e41ad -s ours am: 56424d355e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad3f10d6e08fece4b9ecf193f7fcbc55ccc6ddcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:18:01 +00:00
Automerger Merge Worker
192728f91e Merge changes from topic "am-505afd9430024806aa2c671aef3b93c5" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: 68baeb6c08 -s ours am: 298cb3a25c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours am: c2b193716b -s ours am: ed1263f024 -s ours
 2022-04-27 02:15:49 +00:00
TreeHugger Robot
5671e6d081 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: 68baeb6c08 -s ours am: 298cb3a25c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dffe2ade183fb96cb6abbedb5ebf3c38d25b090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:14:23 +00:00
Bill Yi
db435c6edd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours am: c2b193716b -s ours am: ed1263f024 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibe20f181ce5ba5832eddc22f5a3f0e1a47becb34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:14:08 +00:00
TreeHugger Robot
02457d0e68 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: 68baeb6c08 -s ours am: 615c81031b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4df73e966da12b4e33e246894c7b5ff5f5c5a109
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:14:02 +00:00
Bill Yi
025c03d6f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours am: c2b193716b -s ours am: 9f8abb6e53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba495da223180eef5b558ee49255f46ab46b8163
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 02:13:44 +00:00
Automerger Merge Worker
7bd6130a60 Merge changes from topic "am-828d7b02241a4b7fb76fe599192cd666" into tm-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: e26c4e41ad -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c2f84941f -s ours am: 7146184316 -s ours am: a344350db7 -s ours
 2022-04-27 01:45:20 +00:00
TreeHugger Robot
56424d355e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: e26c4e41ad -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21fbc4c4b19668b7d8129ff6ea053d49ee47e208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 01:44:07 +00:00
TreeHugger Robot
615c81031b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: 68baeb6c08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e652e354e8e2a0b33ea134c34ebe40e663b4abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 01:44:04 +00:00
TreeHugger Robot
298cb3a25c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 3e8135ea74 -s ours am: 1f6b29b35a -s ours am: 68baeb6c08 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2868a1f8e746a3b2d1e59faa2680e014bf9bc9e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-27 01:44:03 +00:00