Commit Graph

130395 Commits

Author SHA1 Message Date
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
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
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
Treehugger Robot
2752b75414 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours am: 433ad45f9a -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: I3fcff2de48eabdc7bd620ce910508d510064b93d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:26:25 +00:00
Bill Yi
74586e7229 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours am: 784294bb97 -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: I057f07660e9d7f75b5d73a18ae4e768bd68217b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:26:17 +00:00
Treehugger Robot
403e98d505 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours am: 6fdaee9c5c -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: If3ad21fba0a961493c74c8b80dc8550f24ea719a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:26:14 +00:00
Treehugger Robot
df5f393282 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -s ours am: 286b8e0e55 -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: I1b2c9bcd2b2a964ba5a7778c2ad0f88c7488d8c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:26:06 +00:00
Bill Yi
816a455afa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours am: 177ac3a068 -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: I745ff9870850472af32f3ba5b613a0c0e45af716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:25:56 +00:00
Bill Yi
c52f62ef99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -s ours am: e559f11cf4 -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: I2a290fd6501193bc704fea75e63be6943fb85a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:25:56 +00:00
Treehugger Robot
bc1bd12c99 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -s ours am: a6aa7acae1 -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: I54b8886dbbe9749ce143fd592199941c3b573d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:25:48 +00:00
Treehugger Robot
ed4b455dcf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours am: 3d1a8bb248 -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: I9905fcdf50170a8c06fe8841579f145ba99532ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:25:36 +00:00
Bill Yi
4425ce5e02 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours am: 51b8c13d45 -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: I128ef425c9ababbfb657a8ea8378cd5bab7b9a73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:25:31 +00:00
Bill Yi
30d5fa39fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours am: e2859cabb0 -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: I818c47d00cc08fa6994ab01aaa4ca79367f705bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:25:17 +00:00
Treehugger Robot
1226389321 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours am: 488375bd15 -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: I310563dbb6ec9780797ed52218210257daae8cee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:25:10 +00:00
Bill Yi
fec858ba99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours am: 3d3b0e525d -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: I32e4ae0597309c35dd7d034b115830842bb63f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:24:51 +00:00
Zaiyue Xue
4b8b7bff39 [automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60 am: 49ac12fa7a -s ours
am skip reason: Merged-In I86f50e953ffd4910acbf9f318e1cc1caa3a7a232 with SHA-1 ec032710dc is already in history

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

Change-Id: I04e0c5c35e96ebbf24fd1bdb81ced67690e33e7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:24:07 +00:00
Zaiyue Xue
a80443e1f4 [automerger skipped] Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60 am: c73bb0874e -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: I261c7f3ee801b32d8dd49ccc3a8637704080de69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:23:35 +00:00
Bill Yi
ad194b0927 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -s ours am: 7c2f3a4ba1 -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: Icfab197e4900a1d3ee7538fdb17c20c91be8bdf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:06:27 +00:00
Treehugger Robot
1dfa0e78df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -s ours am: 7d610e7f85 -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: I483c7df647a3a7fc3b129c482a8b5ab36727f29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:06:01 +00:00
Bill Yi
211d2eb69a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -s ours am: 94f17b981a -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: Idae32d533f1de63ec852177471dbf4d35caacdcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:05:39 +00:00
Zaiyue Xue
7cf38b4f81 [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 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: I4107e4de3286498e46ff35e7cc1b4ff91b341545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 04:04:55 +00:00
Treehugger Robot
286b8e0e55 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -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: I1a582b05d4a521bd92aa0f5079eee9949cb4180e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:46:01 +00:00
Bill Yi
e559f11cf4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -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: Icce0b18e1f09afb6abbc0862eea6eabc60010a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:45:53 +00:00
Treehugger Robot
a6aa7acae1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -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: If2db7e87cdf1725325bf99183c29bf6028e2842b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:45:45 +00:00
Treehugger Robot
433ad45f9a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a505517090 -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: I858559617cd73eca9561236d007f1390fc379dcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:45:44 +00:00
Bill Yi
784294bb97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 58628e0170 -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: I3d07d7cf63993d6205ec7dbdcc40291776d48b45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:45:41 +00:00
Treehugger Robot
6fdaee9c5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c706f8544d -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: I14fc49c761c2d086de8295da72a72cd976633ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:45:34 +00:00
Bill Yi
51b8c13d45 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -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: I891aa0c91c5d5313b11a3fa84d7afa020a7f6051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:45:22 +00:00
Bill Yi
177ac3a068 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -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: I103c3f785cfcb9b61212ce1a23df4a9c38354d87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:45:13 +00:00
Treehugger Robot
488375bd15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -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: I30c3a4b2f500b0b9dbb845d84fbaa969ed0489be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:45:03 +00:00
Treehugger Robot
3d1a8bb248 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -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: I33dccf3b002568d667ca63a15f0a97de71213fd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:44:53 +00:00
Bill Yi
3d3b0e525d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -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: I545b77b4ce7944d75e6747b6a2d25a439b32eadc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:44:47 +00:00
Bill Yi
e2859cabb0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -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: If7bb32836900a594e9f958908317a129d7c0b6f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:44:36 +00:00
Zaiyue Xue
49ac12fa7a Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963

Change-Id: I81b6e72ddae9049ee9b237747ffacae987bf67b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:43:38 +00:00
Bill Yi
7c2f3a4ba1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 23819646e2 -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: Ibcd3f5106e8f6ca98315c92437b7a0179f1e66ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:41:55 +00:00
Zaiyue Xue
c73bb0874e Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963

Change-Id: I337dc943ce94ab303d1b1f555f89b5e347ad11bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:41:53 +00:00
Treehugger Robot
7d610e7f85 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 958690e3a5 -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: I12b528b5410a96bf63d6fb645f12682e57e40b6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:41:36 +00:00
Bill Yi
94f17b981a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b86bd3cfe3 -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: I29ed00f4ef95520f1ebbe6ecdadf9eaa6d1432c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:41:19 +00:00
Zaiyue Xue
da62051efd Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev am: 8c25fe4c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23596963

Change-Id: Ie9e6621a39e30b5ba000e2bf6516719eea2a8fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14 03:39:42 +00:00
Treehugger Robot
a505517090 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-14 03:32:14 +00:00
Treehugger Robot
c706f8544d Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-14 03:32:14 +00:00
Treehugger Robot
958690e3a5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-14 03:32:14 +00:00
Zaiyue Xue
8c25fe4c60 Merge "Don't load battery entry names and icons in offline job to improve memory usage." into udc-dev 2023-06-14 03:01:25 +00:00