Treehugger Robot
dd22d6649c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours am: a7bcd85abc
-s ours am: b487b83d47
-s ours am: 189c459359
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I1c0c0dfcd6f6025320b0f31474822b9b424b64eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:56:45 +00:00
Bill Yi
b415691f3c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours am: ee15b19128
-s ours am: 5f253d4f54
-s ours am: 66c78bf0e4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I115180eac6d034aeb49eea622651e48d379470b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:56:38 +00:00
Treehugger Robot
f485698108
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours am: 3ea3bb83ae
-s ours am: f883c87710
-s ours am: 2c3d366a45
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ib785daf7e1c8fdd402ed24780d8e4d0db85cb070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:56:34 +00:00
Bill Yi
950e92255c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours am: 0138ef4a5e
-s ours am: f77ec98dcb
-s ours am: 51559e3d71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Iafbac79022345cd10128d6a5e3fd312d8cb3ac40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:56:13 +00:00
Treehugger Robot
3896175f53
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours am: 41bd0f8ae1
-s ours am: fba5dceb82
-s ours am: 8cf7ca0d1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: Ib60922d8b81ad6003d5116dbd66c0eaf7f14d9c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:55:55 +00:00
Bill Yi
e965cd9318
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours am: bd6c412717
-s ours am: 79192cfe1c
-s ours am: 025fc9e0d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I1cb4224d456f7e5c26a9bb3d5fc65e18304b1cf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:55:38 +00:00
Zaiyue Xue
503589814b
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
-s ours am: 8cbeaf6a74
-s ours am: c27cd42a1f
-s ours am: 64665795c2
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I3fc44c9871c6fbe2f8e82e9da100f0009591b247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:54:59 +00:00
Zaiyue Xue
6fce77c63d
[automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc
-s ours am: d593cb5284
-s ours am: 7bfd068d24
-s ours am: 37329a1775
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I34eb144e5a04ac3eb12502a483f9dfd589be2a56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:54:56 +00:00
Treehugger Robot
48ed243614
Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
am: f47dbe3bae
am: 2179e44ebe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143
Change-Id: I47739ae6931f396fb8ad2986647905088b29b911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:54:45 +00:00
Treehugger Robot
bb8c25b7ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours am: 7e88b1ed07
-s ours am: 10abf2f63a
-s ours am: 2db2e2c8ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I02f1e448011e5bc0b6e310579a9967ebc5cdf3d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:53:21 +00:00
Bill Yi
6efa238867
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours am: d0d5c9d84c
-s ours am: ef7c503634
-s ours am: 809905795e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: Iff093c3b6f985325634045fe9466b00032a78556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:53:16 +00:00
Treehugger Robot
1ceedaa1d2
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours am: 7930f72c4d
-s ours am: a411c734bb
-s ours am: 82a566dff7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: I545163d4619ad94a8c6dd22aa2302a24273be355
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:53:08 +00:00
Bill Yi
b8e4ab05aa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours am: 7c2f3a4ba1
-s ours am: ad194b0927
-s ours am: 33c08bafc5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ibc3848ce5451fc0e76e708ba82b3396e0bdcba2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:52:37 +00:00
Treehugger Robot
8c0dbb3b48
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours am: 7d610e7f85
-s ours am: 1dfa0e78df
-s ours am: 017e0daa72
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I3bb670b8b76f252f2882d1be5b03285d66ae5954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:52:18 +00:00
Bill Yi
a91592fae0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours am: 94f17b981a
-s ours am: 211d2eb69a
-s ours am: bd3ae5e037
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I51195ffbf699207bd4b4ecd72e8d7f9eb2fdb812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:52:02 +00:00
Zaiyue Xue
adfb4b796e
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
am: da62051efd
-s ours am: 7cf38b4f81
-s ours am: 93968293ef
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: Ibc3d91c5564120655423335006ed677de08c2b51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:51:18 +00:00
Treehugger Robot
104870a508
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours am: ee8cd42af0
-s ours am: e2ee732578
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I5600f32f183826711d21067e32ec05268899cf39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:41:22 +00:00
Bill Yi
e5ed4f2cb0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours am: 4368d3a79a
-s ours am: a49576b187
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I39842e21c9941bd27cbf08ca4efa25646a142903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:41:13 +00:00
SongFerng Wang
448c8b61a8
Merge "Remove the owner" am: 286344d539
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2623772
Change-Id: Iad21da9fbcd8d9279c27beb7a7c0761644d8f2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:36:47 +00:00
TreeHugger Robot
90cf6e8a3c
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-14 05:24:47 +00:00
TreeHugger Robot
9d38813d4b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-14 05:24:47 +00:00
TreeHugger Robot
c937ce7a22
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-06-14 05:24:47 +00:00
Treehugger Robot
2f6b7bea9b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours am: ee8cd42af0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: Idb12eb052e8ee0110647f55a86e0f365bc98017d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:14:11 +00:00
Treehugger Robot
982a120a49
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours am: ee8cd42af0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: Ib27c87243b9f1d6816be99890b2d56eff1e6e09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:14:09 +00:00
Bill Yi
39dbfc2e78
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours am: 4368d3a79a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I6a26cc2c6943e2791a0d632b831cfe086067bdbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:14:08 +00:00
Bill Yi
cdb730cdfa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours am: 4368d3a79a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: Ieaba1b1bbd48de80e9c46a14dcb48e6da761ecd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:14:06 +00:00
Treehugger Robot
ff2819cd07
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours am: ee8cd42af0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: Ia42834d9425f4b56bac17ff055081044b0e2c81c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:13:52 +00:00
Bill Yi
46aaf36b34
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours am: 4368d3a79a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I3fa4ec904eb591b5d99c035982f73eb86324bd6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:13:48 +00:00
Treehugger Robot
e2ee732578
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b8ddf4126c
-s ours am: ee8cd42af0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: Ia4c331a763becd473d4fcb399e1d548c1fd1a334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:09:36 +00:00
Bill Yi
a49576b187
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 49d00437a6
-s ours am: 4368d3a79a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664034
Change-Id: I28779f4e321c73a8ddf81f0a9c0659359e5c9a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 05:09:32 +00:00
SongFerng Wang
286344d539
Merge "Remove the owner"
2023-06-14 05:01:51 +00:00
Treehugger Robot
189c459359
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours am: a7bcd85abc
-s ours am: b487b83d47
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I3565f06ebad6a2b2177c09c4d35fdcefa3aa9fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:53:09 +00:00
Bill Yi
66c78bf0e4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours am: ee15b19128
-s ours am: 5f253d4f54
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I9decaf180ca6e2b352db0df1f1978e6f854612e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:53:03 +00:00
Treehugger Robot
2c3d366a45
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours am: 3ea3bb83ae
-s ours am: f883c87710
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ib50ede06524cd6fbd789d4ce577dac289e4d01e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:52:58 +00:00
Bill Yi
51559e3d71
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours am: 0138ef4a5e
-s ours am: f77ec98dcb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Ic29f4ff30eaada5fcd0baf52337de571a8e8fb23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:52:39 +00:00
Treehugger Robot
8cf7ca0d1d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours am: 41bd0f8ae1
-s ours am: fba5dceb82
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: Ie6a9784026e9306e4d06861ff94908d8c14483c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:52:20 +00:00
Bill Yi
025fc9e0d9
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours am: bd6c412717
-s ours am: 79192cfe1c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: I5076ffad4c5df220bdc424209dc79ece685915a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:52:03 +00:00
Zaiyue Xue
64665795c2
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
-s ours am: 8cbeaf6a74
-s ours am: c27cd42a1f
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I978e5031e45f399b64bf733d5c8e63d02bdbbb99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:51:25 +00:00
Zaiyue Xue
37329a1775
[automerger skipped] Don't load battery entry names and icons in offline job to improve memory usage. am: ec032710dc
-s ours am: d593cb5284
-s ours am: 7bfd068d24
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I2a8ab7f6daf55385d8dccdcdce9f193dde2158d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:51:23 +00:00
Treehugger Robot
2179e44ebe
Merge "Shutdown secondary SAP automatically" into udc-d1-dev am: 57522f0fcc
am: f47dbe3bae
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23680143
Change-Id: I37b5082e932c4141dcb3b277c84b096d93ffb3db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:51:15 +00:00
Treehugger Robot
2db2e2c8ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours am: 7e88b1ed07
-s ours am: 10abf2f63a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: Ida81c1d241df32714205d9d046db51a308c055f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:49:56 +00:00
Bill Yi
809905795e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours am: d0d5c9d84c
-s ours am: ef7c503634
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664847
Change-Id: I8daac4f5ac5f61a135966a4bbd0a2e721cf61bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:49:49 +00:00
Treehugger Robot
82a566dff7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours am: 7930f72c4d
-s ours am: a411c734bb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: I9eb882025e8da62dc8119a7c5aaf5ee78634905d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:49:46 +00:00
Bill Yi
33c08bafc5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours am: 7c2f3a4ba1
-s ours am: ad194b0927
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664844
Change-Id: Id08525905c17308687d8479aeffdda65edbe6bd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:49:27 +00:00
Treehugger Robot
017e0daa72
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours am: 7d610e7f85
-s ours am: 1dfa0e78df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: Ic973ade7400dedbcfe22625140dab9236c002d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:49:06 +00:00
Bill Yi
bd3ae5e037
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours am: 94f17b981a
-s ours am: 211d2eb69a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23664035
Change-Id: Ib5a7b3de9f889322e394cb15c0b4c5e3d20c19a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:48:49 +00:00
Zaiyue Xue
93968293ef
[automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
am: da62051efd
-s ours am: 7cf38b4f81
-s ours
...
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 65cb6ef230
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963
Change-Id: I8b57700ba20bff2a289d7c4a21f81801368a782d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-06-14 04:48:09 +00:00
Treehugger Robot
7cfb668c56
Merge "[BiometricsV2] Fix fingerprintSettings not shown"
2023-06-14 04:39:57 +00:00
tom hsu
0a4458a9d1
[Settings] Imporve MMS message UI state update
...
- When activity entered from outside, the MMS message is not udpated.
Therefore, add a update behavior to onStart()
Bug: 281566495#5
Test: Manual test passed
Test: atest passed.
Change-Id: I3e5994ad0dbcdd1b78ae3e10e3cb564ce210e93e
2023-06-14 12:28:59 +08:00
Automerger Merge Worker
101af2e3c9
Merge changes from topic "am-f95f0710b04a405aa5a6322c87c74a7c"
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090
-s ours am: 433ad45f9a
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170
-s ours am: 784294bb97
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d
-s ours am: 6fdaee9c5c
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2
-s ours am: 177ac3a068
-s ours
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5
-s ours am: 3d1a8bb248
-s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3
-s ours am: e2859cabb0
-s ours
2023-06-14 04:26:47 +00:00