PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,121 Commits 1 Branch 0 Tags
8c71335c767af91e8f4bcba76f3b77446353c75c
Commit Graph

130121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Oli Thompson
dcce8fa662 Fix emergency button not visible on pattern work challenge screen 
Hide the subtext for work challenge pattern,so everything fits and
adjust some spacing

Test: btest a.d.g.WorkTelephonyTest#workChallengePatternScreen_whenAllSubscriptionsManaged_hasEmergencyButton -nm
Bug: 283137301
Bug: 286391641
Change-Id: Ia6214b624f8d7328f7445f01a08166b8ab33fdec
 2023-06-09 13:06:39 +00:00
Bill Yi
bcec2e6113 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: adefb73221 -s ours am: 3365a09592 -s ours am: 67c8d90a01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I084eeaefaa88577e7ed76c8818ef897d8fa805dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:35:54 +00:00
Zaiyue Xue
63ad222c02 Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 am: dff1bd58de am: de151e008b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: Iceb38fbf36b32674346d0dcf52521cfe4058b5b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:31:53 +00:00
Automerger Merge Worker
d4130808df Merge "Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 am: 44fcc61baf am: c19305590c" 2023-06-09 12:31:38 +00:00
Zaiyue Xue
ed66e21cba Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 am: 44fcc61baf am: c19305590c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: I6691f8ac01ec53f8de1fd4b9c69055660a48ce32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:31:34 +00:00
TreeHugger Robot
9df5a43674 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 6834cfffe4 -s ours am: 0780dfa949 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I66b970ef5aec59b68f30fb255d1de57f2686fde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:31:12 +00:00
Bill Yi
2a72ec0f4c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b57ebe9c3b -s ours am: 55d50df359 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I47140fb3ff0e6d939bf236f9651775157921f1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:31:10 +00:00
TreeHugger Robot
5069d26f1a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c2a92b394e -s ours am: 81821b6bb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a68dace662807f6bb134da6fc1f26d0c3813330
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:31:08 +00:00
Bill Yi
ff4bb2c6e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2bcb8c25fd -s ours am: f100547011 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9fc88efd93b8cef73335302714b4d868ec884ff6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:30:43 +00:00
TreeHugger Robot
a53257ae9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: fef0572018 -s ours am: 7f378bea3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I740d2bd037ec7a046bf0544ddfca8cf42f6af518
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:30:24 +00:00
Bill Yi
e9b24d5299 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e841794da4 -s ours am: 599b4acb22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ied16908371e42118f0976c8b84f552c017441955
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 12:30:06 +00:00
Zaiyue Xue
de151e008b Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 am: dff1bd58de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: Id0a5a896ec8e8203204714249f4c9d756eb7cbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 11:46:16 +00:00
Zaiyue Xue
c19305590c Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 am: 44fcc61baf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: I3364f31694053b7c19b99eb9d305f8b4cb9b225c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 11:43:55 +00:00
Zaiyue Xue
dff1bd58de Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: I07e697bb37a2c3655b7e5b6e5177c8d9d9059f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 11:01:47 +00:00
Zaiyue Xue
44fcc61baf Don't load battery entry name and icon in offline job to improve memory usage. am: 65cb6ef230 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23629343

Change-Id: I25d159e01c517f4dbd0670dd1273c5da9b1ab21d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:57:14 +00:00
SongFerng Wang
d8cd28f3c5 Merge "Modify the MetricsCategory as VPN_APP_MANAGEMENT" into udc-dev am: bbf55cafb9 am: 02fda559ba 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442439

Change-Id: Ic13d2b7c944eb5e256422338246c4d82964511f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:08:27 +00:00
Julia Reynolds
1b16f41e22 Merge "Update string to be phone/tablet agnostic" into udc-dev am: a171a9d426 am: 0322388618 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451841

Change-Id: Iffa4b2c969c5fc171d7ac90df97d81364a17fc6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:08:16 +00:00
SongFerng Wang
aac4848fc7 Merge "Try to avoid the timing UI issue" into udc-dev am: c4ed48cbe4 am: e70207dc54 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467967

Change-Id: I4789d8f22c3f5eee09720fc5c685063b4cf9cbce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:08:08 +00:00
Zoey Chen
6add9e2a8f [automerger skipped] [Panlingual] Remove the large space when searching language am: 1f76872d78 am: 687b6292d4 -s ours 
am skip reason: Merged-In Ie8653536117a999bd420ccfce961b17fe9349d35 with SHA-1 1f76872d78 is already in history

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

Change-Id: Ic93910041441b667ec7a406ba0da55fc8c8aa0af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:08:00 +00:00
TreeHugger Robot
50dee4fac5 Merge "[Settings] Remove redundant sort" into udc-dev am: b98d6644ed am: f1ab3bd9db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442451

Change-Id: I576ecf5327af787b3fab13675d9ec3c13b5b7dc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 10:07:33 +00:00
Chaohui Wang
5c9cf921bc Update activity name for ManageFullScreenIntent am: 94906cfe3d am: 3f754ec128 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23467206

Change-Id: I659244362cb9b5ba47f9f4e1aa9b891ccdde4eb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:44:03 +00:00
TreeHugger Robot
b5a8064c78 Merge "Update bad calibration error message" into udc-dev am: 1df5ad89ee am: 4460f0043b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23452010

Change-Id: I68dff07df224e9ea426379a616858d08a4d3951a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:43:51 +00:00
Treehugger Robot
c4ef452939 Merge "Restrict Printing Settings" into tm-qpr-dev am: 5fa6d3b7dc am: 24db1f3393 am: 8dd85e2f69 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23296956

Change-Id: I46af41c3cc75670aa4722f9c1485e027f7c0f397
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:43:29 +00:00
Julia Reynolds
1e54d92d67 Merge "Revert "Update theme for ChannelPanelActivity"" into udc-dev am: 3ab478416d am: 2e2c65fa24 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23451739

Change-Id: I35be3e940875639cdf8288eebfe22629e3fdaeb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:43:21 +00:00
Tom Hsu
1a7f00194a Merge "[Settings] Add data roaming observer" into udc-dev am: b1b4e25f33 am: 15cbfa2ccd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429460

Change-Id: I3d283f1c84c9777f6aaf2c72ac0a0e0a5823c3cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:43:12 +00:00
Treehugger Robot
e872d3f0df Merge "[Settings] After APM on, do not show the page result in Settings search" into udc-dev am: d3b41aa905 am: b378116735 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442441

Change-Id: Ifb0d1c66c0373ca423bdd7dee40048dfaa71618d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:43:04 +00:00
TreeHugger Robot
239ad390d7 Merge "Fixed unable to enable hotspot with Security None" into udc-dev am: 52d2daf3b3 am: c0f65ed089 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23442438

Change-Id: I1274715375ed58940a54ff1ebe6f12a60a53a4a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:42:56 +00:00
Tom Hsu
0bae0e2853 Merge "[Settings] Avoid settings crash from NPE of TelephonyManager." into udc-dev am: 69caf6fbe4 am: 78ddf4048b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23429462

Change-Id: I0076ca23acc20568119a47663cdbb1fbb68c52dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:42:47 +00:00
Yuxin Hu
a187a8c505 Merge "Fix "Enable ANGLE" switch behavior when Developer Option Switch is off" into udc-dev am: 67c72c01cb am: 39aac64af8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23360519

Change-Id: I7bd9657042b996437ca40f7d34bf8e6db9296c80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:42:39 +00:00
Treehugger Robot
dba51b4027 Merge "[Settings] Use background thread to get VoNr state." into udc-dev am: 1fd77775cb am: 1712f5bb3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405373

Change-Id: I460cf980a6f7763a20f49c71626fae9343fc88a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:42:31 +00:00
Chaohui Wang
0e736eb85a Merge "Fix crash of PictureInPicture" into udc-dev am: 5b042e2feb am: 5cc62e8177 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23408018

Change-Id: Ic4f8ede2b8083cef4134a5b6afedaa60f95ee4bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:42:22 +00:00
Zaiyue Xue
65cb6ef230 Don't load battery entry name and icon in offline job to improve memory usage. 
Risk: low, the name and icon will be always loaded again in the UI.

Bug: 280720236
Test: manual
Change-Id: I86f50e953ffd4910acbf9f318e1cc1caa3a7a232
 2023-06-09 08:41:51 +00:00
Diya Bera
20e0537fd8 Fingerprint Error Dialog am: 71dd391e4d am: a1b55642d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23378197

Change-Id: I5b5c2dcaa29a1c9a5325e899fa0f670b7c9fb4ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:34:33 +00:00
SongFerng Wang
7a16645c60 Merge "The BluetoothDevicePreference register the MetadataChanged" into udc-dev am: 71a5715e3e am: b73bb7d036 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23405361

Change-Id: Ib17bb482c1613e47125582e0ac7ee87edb274233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:34:25 +00:00
Jason Hsu
d4e5437e6f Merge "Remove 'Media' type Audio output in Hearing devices settings" into udc-dev am: fe00702ab3 am: 0a1e716094 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382078

Change-Id: Ib015d68e476e83cb43a2f5f73f911654e682c707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:34:17 +00:00
Bill Yi
f359630820 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 07b6109a0f -s ours am: 128036a053 -s ours am: 7ee1c41818 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba37f90c690d6ced6bc4245062040f97a95d88a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:33:51 +00:00
Bill Yi
9ed88d19c8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e4cc2b888b -s ours am: affa411d4e -s ours am: 1ccd7dca42 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I89e644e00d456c0e087eceef6fb9e3006953dd68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:33:47 +00:00
Daniel Huang
7aad86e390 Merge "Update summary for Languages and Keyboard" into udc-dev am: e51bbfcbbd am: 9917138881 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23382079

Change-Id: I3d2f12e7e2d0515e8f31e9372e833672e698227a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:33:00 +00:00
Bill Yi
59283957f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 02863edd4e -s ours am: c40e106be2 -s ours am: b2fa6cce12 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I81e3a3a2244ef5c022b6a39842d7e3aeff810884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 07:22:47 +00:00
Bill Yi
9ffaf81825 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 27d96e91e7 -s ours am: 789290be46 -s ours am: af52cb7b70 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iab9232c7be5a0334de67808d8361b38f29129d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:53:46 +00:00
Bill Yi
0976284164 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c2e4800c6 -s ours am: c5a289d530 -s ours am: 1b70e8447c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie3ddbca7245e7073ad63e41f70235caf9644165c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:53:22 +00:00
Zoey Chen
943d6e1c9b Merge "[Panlingual] Set focus to the drag list to avoid the overlapping" into udc-qpr-dev am: 593028ca32 am: db4bede383 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23615216

Change-Id: Ia07c39769f77ed05dab029a8cedf57f1008402ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:34:21 +00:00
Automerger Merge Worker
22dffd96df Merge changes from topic "am-b070b0b7c5a542978d1714ca00975cfd" 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: c18a26cfc7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 12d0871239 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: 2209398336 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: 9284a7ce05 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 39fefbc6bc -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 81564a8384 -s ours am: 2dea83b0ca -s ours
 2023-06-09 06:34:11 +00:00
Treehugger Robot
ea788669e3 Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160 am: 4b44c6632e am: de7585a864 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566

Change-Id: I12f94494d3b9fa0da9b423d4a40c65e376fe9f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:33:57 +00:00
Treehugger Robot
bae3bf9b63 Merge "Show "Not available" summary when hotspot speed is unavailable" into udc-d1-dev am: a99c52e160 am: 34a254fc0c am: cc4410e536 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23601566

Change-Id: Idfc98b457000a4968a47651b35f271e3bc20c3bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:33:29 +00:00
Bill Yi
56cc965981 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c13633d1d0 -s ours am: c18a26cfc7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9495bf406ed00634d423b2f4e5b0a05d5766e4fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:33:14 +00:00
Bill Yi
0a2a90766b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2e8c8077b -s ours am: 12d0871239 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c10bb1266c12e19d975dfe017782d709b4cc369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:32:51 +00:00
Bill Yi
639d3aec0d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 67553d6348 -s ours am: 2209398336 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec680ab5cb77d99fc3c2163c7c0fbcd82b84488e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:32:44 +00:00
Bill Yi
03622513c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 197ad03f9e -s ours am: 9284a7ce05 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I033f651bc86b04a438e51e8ababa8ff66c5d9ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:32:25 +00:00
Bill Yi
df3413bb5f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: dd664531a5 -s ours am: 39fefbc6bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7440652a737f1327287501095c4414a91120c902
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 06:31:59 +00:00