PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,121 Commits 1 Branch 0 Tags
83a286281381ce8d29fb448a08f68d7cf725696f
Commit Graph

113121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
83a2862813 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours am: c2908edff1 -s ours am: bc13166ecb -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7605f89bc5e3fedf4fc50394880499152a08f5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 06:21:42 +00:00
Bill Yi
49c9d3d421 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours am: fd7fcb1094 -s ours am: 4781a12d96 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib0d289f0bb5d34b147c22b6e740ef2fceaecbad0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 06:21:21 +00:00
Menghan Li
32a24032e8 Merge "Remove obsoleted code: DividerSwitchPreference" 2022-07-12 06:18:28 +00:00
TreeHugger Robot
bc13166ecb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours am: c2908edff1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a255d4da726411e182e92ca2b65758b77bcc618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:44:56 +00:00
Bill Yi
4781a12d96 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours am: fd7fcb1094 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4d8e99c928af01463aebee593b3e199f969a1c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:44:32 +00:00
TreeHugger Robot
c2908edff1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 0e046fc4ae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43af99d9dbdedea318fd7d53bf341629efb56624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:19:43 +00:00
Bill Yi
fd7fcb1094 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3d4eb4f4b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I67076fc837020ff031bb770a9174889dc3e28284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:19:17 +00:00
Amy Hsu
3d2023b439 [automerger skipped] Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: ef540c685d -s ours am: bb1c1a9954 -s ours 
am skip reason: Merged-In Ib4622490b0f63139b47f242ebcae916edf291cea with SHA-1 7087e5c457 is already in history

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

Change-Id: I517b56b5b83fc7031e1633fe5d68ce9d98b44b39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:06:57 +00:00
Amy Hsu
25bd14a556 [automerger skipped] Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: f51951c9d3 am: a067fba01f -s ours 
am skip reason: Merged-In Ib4622490b0f63139b47f242ebcae916edf291cea with SHA-1 99f86db37f is already in history

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

Change-Id: If4af94c92a01acd22e06b37827618f192ebdc786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 05:06:34 +00:00
TreeHugger Robot
0e046fc4ae Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-12 04:54:58 +00:00
Amy Hsu
bb1c1a9954 [automerger skipped] Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: ef540c685d -s ours 
am skip reason: Merged-In Ib4622490b0f63139b47f242ebcae916edf291cea with SHA-1 7087e5c457 is already in history

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

Change-Id: I9792a751ac493ecf4435a19f129d5590bedc1752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:48:32 +00:00
Amy Hsu
a067fba01f Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 am: f51951c9d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855

Change-Id: If81fa8f115b89eb458b02736276940d8148458e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:47:15 +00:00
Amy Hsu
ef540c685d Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855

Change-Id: I7f6bf6ad05de82ad77ced5bd776c3602f4057290
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:15:31 +00:00
Amy Hsu
f51951c9d3 Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855

Change-Id: Ie9b806a127e7eced1b9d790beb874e712e452de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 04:15:21 +00:00
Amy Hsu
1f7fab03c8 Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev 2022-07-12 03:54:27 +00:00
menghanli
ab6cbea3fd Remove obsoleted code: DividerSwitchPreference 
Settings don't show divider in material design. The DividerSwitchPreference is not used now.

Bug: 197695932
Test: make RunSettingsRoboTest
Change-Id: I3fef9401b5c4a3e7d4ca6fc966f3e60c57558cdd
 2022-07-12 11:23:55 +08:00
Amy Hsu
c9bf3e88e7 Merge "[RRS] Activate investigation of screen_resolution in settingsstats" 2022-07-12 01:51:06 +00:00
Robert Luo
11b53f770a [automerger skipped] Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev am: bc66c0aba9 am: 55db71536c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05a0aa98351e8a99adfe7035a0422d7d5139a7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 00:16:46 +00:00
Hugh Chen
f5a6c7ef2a [automerger skipped] RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings am: f5166f46e8 am: e88be4859c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idedebad669e6d5a0dd63355cd238499cb89ff9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 00:16:42 +00:00
Robert Luo
55db71536c Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev am: bc66c0aba9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589

Change-Id: I6e7fa3acabc6b9fff62eb73fe2c47a915c4f13f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 00:00:20 +00:00
Hugh Chen
e88be4859c RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings am: f5166f46e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753589

Change-Id: Ida6c1387588887b78f33de9f655b5397d04c4258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-12 00:00:14 +00:00
Robert Luo
bc66c0aba9 Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev 2022-07-11 23:36:02 +00:00
TreeHugger Robot
2d39ecf2ee [automerger skipped] Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev am: f38e8e6194 am: 92e7da84e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia804ea786ff69d3e4aca6244df33d5cf5ecfd8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 23:28:23 +00:00
Hugh Chen
50a1e950a6 [automerger skipped] RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings am: 858e6ff3d5 am: 95d2add6a2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id0f7e8c9f724b5b814f15e47b3ba8f58f1bd6947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 23:28:16 +00:00
TreeHugger Robot
92e7da84e2 Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev am: f38e8e6194 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588

Change-Id: Ib61748c3a5bfd25049c4020a162b067584fb037e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 23:09:54 +00:00
Hugh Chen
95d2add6a2 RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings am: 858e6ff3d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18753588

Change-Id: I6ba14905e50fb1fad3036cd91a8d2c9ceac2621e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 23:09:47 +00:00
TreeHugger Robot
f38e8e6194 Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev 2022-07-11 22:50:58 +00:00
Grace Cheng
92f0c3d84d Display screen protector string and icon in fingerprint enrollment only on relevant devices am: 3c53dac81b am: d39bc04b42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19224339

Change-Id: I21e9f671f5c5c58a4f5506984ee08caebf7c2bdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 19:45:09 +00:00
Grace Cheng
d39bc04b42 Display screen protector string and icon in fingerprint enrollment only on relevant devices am: 3c53dac81b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19224339

Change-Id: I4c9214324c86cc1070e2cec06a46f761b4afc689
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-11 19:27:00 +00:00
Bill Yi
3d4eb4f4b9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I043b44e648cce2709d66ea0b0cdc4c367de844d6
 2022-07-11 11:59:15 -07:00
TreeHugger Robot
60ecf13e09 Merge "Export callback to receive seekbar change event from SeekBarPrefernce" 2022-07-11 11:53:55 +00:00
Wesley Wang
d3bead822c Export callback to receive seekbar change event from SeekBarPrefernce 
- Export onSeekBarChangeListener callback to receive change event from parent
  - Update battery saver schedule trigger threshold after seekbar tounch
    ending instead of update it every time during dragging or touching

Bug: 236356020
Test: make RunSettingsRoboTests
Change-Id: Ifee7cd9e7cabfbec0817a4c28254228f885d6a8d
 2022-07-11 17:49:00 +08:00
Amy Hsu
99f86db37f [RRS] Activate investigation of screen_resolution in settingsstats 
Define a setting string for putting data for suez/settingstats.

Bug: 234035619
Test: Manually check ScreenResolution ap in Settings can work normally.
      atest SettingsUnitTests:ScreenResolutionFragmentTest
Change-Id: Ib4622490b0f63139b47f242ebcae916edf291cea
 2022-07-09 01:10:49 +00:00
Grace Cheng
3c53dac81b Display screen protector string and icon in fingerprint enrollment only on relevant devices 
Sets screen protector string and icon visibility to visible on UDFPS, and non-visible on non-UDFPS devices

Fixes: 230156966
Test: Navigate to fingerprint enrollment page to see string & icon are
gone on side-FPS device

Change-Id: I527fb0d944a7c8180297ad44efa3e9bba3012703
 2022-07-08 23:39:32 +00:00
Bill Yi
a7e2ec53fa [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours am: 43bed90ebd -s ours am: 40bd36207e -s ours am: 46b5269704 -s ours am: c4f67d32b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2436f8e7911ef70eda8026f48013e43784e4d1b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 22:06:08 +00:00
Bill Yi
b9f02aa43a [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc76 -s ours am: 588a5a1577 -s ours am: 5b0b300d4d -s ours am: cc6cd60c19 -s ours am: 333191334a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba52f73cc359f3687d19bd807b0e7e7f9459778c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 22:05:52 +00:00
Bill Yi
c4f67d32b4 [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours am: 43bed90ebd -s ours am: 40bd36207e -s ours am: 46b5269704 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f04dbcf22a727ed54e9de4edaa82dc148d74b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:57:52 +00:00
Bill Yi
333191334a [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc76 -s ours am: 588a5a1577 -s ours am: 5b0b300d4d -s ours am: cc6cd60c19 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I56e76839da1f42fd177951abd07f43f94b3fbb4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:57:33 +00:00
SongFerngWang
ca401886c7 [MEP] Hide the preferred SIM dialog when the user has replaced the SIM am: 286dce6b6e am: 289796e9a3 am: 4a48dc5e96 am: 0f3d08a28c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19194541

Change-Id: I61886469e5f49461556423615e4a8d8c2e7a11ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:42:45 +00:00
Bill Yi
1cb6f8dcd9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 36139e2e09 -s ours am: 75bbbd7e94 -s ours am: 2800a2b1ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I77282491f167341fece1d9beea2a9d3ed69cfdce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:36:32 +00:00
Bill Yi
cf0f15cd91 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: e73c1c14be -s ours am: 1e80eafe18 -s ours am: 4bb22b64c7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30f240a9ef3ee6095e8fee44c1551beb2701b336
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:36:28 +00:00
Bill Yi
5235bcccf4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: 93f6d69a60 -s ours am: 8802d04401 -s ours am: bf70c2e9e3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iadf66a5e18ae1a645dbdd5955f7a8c048d50666a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:36:18 +00:00
Bill Yi
46b5269704 [automerger skipped] Merge "Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE" am: 2fcb15c9c1 -s ours am: 43bed90ebd -s ours am: 40bd36207e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I021fd2f8d5b94fd97e3eb44b49ba80db2688bd3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:34:37 +00:00
Bill Yi
cc6cd60c19 [automerger skipped] Merge SQ3A.220705.003 to aosp-master - DO NOT MERGE am: c73b07dc76 -s ours am: 588a5a1577 -s ours am: 5b0b300d4d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27f6876d85ea0a65ad898391cc22dbfbd1d6cc09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:34:24 +00:00
Bill Yi
7c49e8a9d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours am: 09b0e3ecd2 -s ours am: f2b015078d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7463756330d7653fa0f93dc631e9f3855416a611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:28:51 +00:00
Bill Yi
be51cdd240 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours am: 6f2d360a38 -s ours am: f0fda8ed36 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I797a25dec5c1356589f47b5b998f2e4c5f58997b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:28:37 +00:00
TreeHugger Robot
f296b5a072 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours am: b182c27349 -s ours am: 512c7de992 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcf59d885acf7af73b73fba84eda4a769cd7578c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:21:46 +00:00
Bill Yi
1cb714c9bc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours am: 75ad2310e5 -s ours am: 228a4e3c40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae77b40892919860537099658f67e8e4406b866d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:21:41 +00:00
TreeHugger Robot
0e8d516652 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours am: bdec4b1993 -s ours am: bdceb524a5 -s ours am: 3dc5c2ab32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iaa2440cca9a6c78d58d007fa4b60660de1efb33d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:19:28 +00:00
Bill Yi
021a3a5fdd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83 -s ours am: 6e16015e80 -s ours am: 5dae5623ea -s ours am: 44bc157e7d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6fd9fa6ad722199feef81b99418a0b5edb6673e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-08 21:19:24 +00:00