PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,983 Commits 1 Branch 0 Tags
d4342e54832605eaa35ecd251a0b2f09cf6e466f
Commit Graph

112983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
d4342e5483 Fix the font size inconsistency on "Erase all data" page. 
Update "sud_layout_description" to "sud_layout_subtitle", because the
"sud_layout_description" is outdated and working not as expected.

Bug: 235315492
Test: Manually test on device
Change-Id: Ic48282e4cbcbff6e0bf2c27f512123770cce0788
 2022-07-07 02:21:11 +00:00
Bill Yi
f31a0eb66a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours am: d5c5fdda14 -s ours am: 131976f2f5 -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: I14b28cf2605112370955a751a4d47ac9cbf2fd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:20:46 +00:00
Bill Yi
f69119f24a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours am: 4e53b0a04c -s ours am: aea4fecb34 -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: I573c272f12a427e407df3a18de4ed2b469719f97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:20:32 +00:00
Bill Yi
c723c4913e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -s ours am: 00ce7a948f -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: Ic41758a31901b43de59eea31858360f717ef9273
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:19:30 +00:00
Bill Yi
4001ea3f7b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -s ours am: f3be71db07 -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: I46716d9022aabb67eb72684616c1112ed0eaf25e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:19:24 +00:00
Bill Yi
588a54e146 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -s ours am: f93ba2665c -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: I7cd7804bc7a67249f52084e15b51d57abe6b76d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:19:16 +00:00
TreeHugger Robot
0300239d77 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours am: c8a0d723a8 -s ours am: 6c0cb3ede1 -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: I7a5390b240d21805d68563095792608ef596df57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:18:43 +00:00
Bill Yi
b72647ce59 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours am: fcf27909d7 -s ours am: fe1de885b6 -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: Ife07ec4167f52e37746944caf064c3810419e2f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:18:38 +00:00
Bill Yi
131976f2f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -s ours am: d5c5fdda14 -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: Ib7b96e65d3f75149d78cbf87e56bf7fbeea8f727
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:03:39 +00:00
Bill Yi
aea4fecb34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -s ours am: 4e53b0a04c -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: I7da49f0bb66080403ff8939943494fc7360a0e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:03:23 +00:00
Bill Yi
00ce7a948f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -s ours am: 1fd3156ec7 -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: Id3553d1cd90c1cb6665d184141836e8c7365bc49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:01:48 +00:00
Bill Yi
f3be71db07 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -s ours am: 992e8328bd -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: Ic5f7eb29a2676dc6aaf8a27e49bc588292ae62c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:01:40 +00:00
Bill Yi
f93ba2665c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -s ours am: 50eb4245cc -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: I4cd5f4431b71081bb15851602691052d8250157b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:01:35 +00:00
TreeHugger Robot
6c0cb3ede1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -s ours am: c8a0d723a8 -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: I55b7c83380ec44b3c6b8e86728f69cb26f8125c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:00:38 +00:00
Bill Yi
fe1de885b6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -s ours am: fcf27909d7 -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: Ia4ca9bbca464a7e0443b2ecafe9cf9f2118c325a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 06:00:35 +00:00
Bill Yi
d5c5fdda14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: eda8321a12 -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: Ia2d7663f8aa28b4fcf7f714e35a66c48e1e185af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 05:44:41 +00:00
Bill Yi
4e53b0a04c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 80c1acdaf0 -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: I9bd798dcced11ae83b9341e3ebe4e7ff4c29e100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 05:44:24 +00:00
TreeHugger Robot
c8a0d723a8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: d5c37555b7 -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: Ide7b7cd9b8386e61fb6d98326a603ba24f17deb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 05:41:47 +00:00
Bill Yi
fcf27909d7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2b251ec36 -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: I1d52ec5e318e99cfaa2402d8b6672fa4d97594e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 05:41:37 +00:00
Bill Yi
1fd3156ec7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 44c1f479d3 -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: I4e9f640550a6ba839080bf5db6a76def2ca2f7e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 05:34:08 +00:00
Bill Yi
992e8328bd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2c65a1d804 -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: I6664f45591969573c47e8de87c2aa1f9015ddc3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 05:34:05 +00:00
Bill Yi
50eb4245cc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b55af7d44d -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: Id50143411336cc13e6c029cb2789150b50544f4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-06 05:33:54 +00:00
Bill Yi
9fc986d019 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-06 05:07:11 +00:00
Bill Yi
308b5d00e9 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-07-06 05:07:11 +00:00
Bill Yi
eda8321a12 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-06 05:06:38 +00:00
Bill Yi
44c1f479d3 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2022-07-06 05:05:28 +00:00
TreeHugger Robot
d5c37555b7 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-07-06 05:03:07 +00:00
PETER LIANG
0e887c9fb0 Merge "Avoid the reset item having inconsistent alignment with the others under SuW." 2022-07-05 14:58:38 +00:00
TreeHugger Robot
0abfd5c416 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f29e93bf9e -s ours am: 5067a22ec6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28d676d66a7406970111677c95b182f0fe96029c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 08:15:32 +00:00
Bill Yi
084d4d2db8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b8ae8cd5c5 -s ours am: a2218a2ec7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic2d8e774c09fef44f9651ad68a4e00ffcde0f872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 08:15:12 +00:00
TreeHugger Robot
5067a22ec6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: f29e93bf9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia0e288f8817e6f0734b74e5cf06d7b319b976d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 08:05:16 +00:00
Bill Yi
a2218a2ec7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b8ae8cd5c5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4bcd9c20c4c7d95dd43584d8d8f8a16d6187b9bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 08:04:59 +00:00
TreeHugger Robot
f29e93bf9e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-07-05 07:47:58 +00:00
TreeHugger Robot
fdf6228079 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8cfdb03d35 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I23096c174122456469b24f434bcb89b70f8312ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 07:46:42 +00:00
TreeHugger Robot
4f39061375 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 16ec6ea598 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd0d24215928eed2e36b2f931cec24ca033cf0d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 07:45:50 +00:00
Bill Yi
fe21707278 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6da62ec091 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1139474e867a5a5d198f6be886997d11325c28fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 07:45:45 +00:00
Peter_Liang
772e114438 Avoid the reset item having inconsistent alignment with the others under SuW. 
Replaces the LayoutPreference with native Preference for the reset preference which is used for resettings the status of all preferences.

Bug: 232528123
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingResetControllerTest,TextReadingResetPreferenceTest
Change-Id: I00719f13dc78039269ee373c6b35e12e7ff595ce
 2022-07-05 15:32:37 +08:00
TreeHugger Robot
8cfdb03d35 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-07-05 07:27:44 +00:00
TreeHugger Robot
16ec6ea598 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-07-05 07:27:44 +00:00
TreeHugger Robot
933ba96b28 Merge changes from topic "tc_change_22070415_28" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 219678d5f9
  Import translations. DO NOT MERGE ANYWHERE
 2022-07-05 07:27:44 +00:00
Bill Yi
925bb87e0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b4523a0392 -s ours am: 3c98297091 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2e643360a1238afd29c695586a3b4b9d8d285d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 06:53:15 +00:00
Bill Yi
3c98297091 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b4523a0392 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie9becfd41fa444791dea13a3179964c8cae3951c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 06:35:08 +00:00
Automerger Merge Worker
54cb09f253 Merge changes from topic "am-101ab8c296574b6fa95fe50a0dfbd6c6" into tm-d1-dev-plus-aosp am: 37b35470e5 am: 1e78c7f9fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616

Change-Id: I21712c7c62519d0df33e53f4bdee50751cf2605c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 03:20:37 +00:00
TreeHugger Robot
25f5d22701 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours am: c5c74f5a8a -s ours am: 7c0cda59e5 -s ours am: 9fe1129b91 -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: I802b81d03747a9de06e3545e1ae2ac3fa7a7a34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 03:20:33 +00:00
TreeHugger Robot
5ca7c307bb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours am: bdec4b1993 -s ours am: b5fecdc118 -s ours am: 8881007475 -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: I9823059c0fcff1ba8a2826c3101ae0752d906272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 03:19:24 +00:00
Bill Yi
f32c03ef4b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83 -s ours am: 6e16015e80 -s ours am: d80383c45b -s ours am: bce3417067 -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: I198de7796e0de3f7189d52ef089b8404c5898e53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 03:19:19 +00:00
Automerger Merge Worker
1e78c7f9fb Merge changes from topic "am-101ab8c296574b6fa95fe50a0dfbd6c6" into tm-d1-dev-plus-aosp am: 37b35470e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19170616

Change-Id: Ib1451487c0d131eb045401888c53ffde9a8da048
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 03:19:10 +00:00
TreeHugger Robot
9fe1129b91 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours am: c5c74f5a8a -s ours am: 7c0cda59e5 -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: I68c10c546461af131c3cc35259ab855e00a9908f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 03:19:03 +00:00
TreeHugger Robot
8881007475 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e2cd20fa19 -s ours am: bdec4b1993 -s ours am: b5fecdc118 -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: I31ebc0dec5b108cf4710be429820ced5883f6e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 03:18:21 +00:00
Bill Yi
bce3417067 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 72134f4c83 -s ours am: 6e16015e80 -s ours am: d80383c45b -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: I193de310e4ece8f0d24c238e96dc88dcf36f9517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-05 03:18:17 +00:00