PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
125,091 Commits 1 Branch 0 Tags
2f92b09ebbf56c526086ee5eb401d672e001b7c1
Commit Graph

125091 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
abce7eb398 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours am: d2fa0c27de -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib41319892c8e30df912b6b529c02d7cac84249e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:50:54 +00:00
Hao Dong
d44eccbc5f Merge "Fix delete face button disappear after reenroll" into udc-d1-dev am: 0f63a450a8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23768213

Change-Id: Idc66a1838b701b91affa038a581b1410b78115a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:50:35 +00:00
Bill Yi
ced4e8df8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I28473ca95c4f26f45811162685f95dfad0d1c57e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:07:56 +00:00
Bill Yi
d2fa0c27de [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24a7a54341 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I452f11e910b1b1c99ed2d8cd06c5915f6df6d1dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-23 00:07:11 +00:00
Hao Dong
0f63a450a8 Merge "Fix delete face button disappear after reenroll" into udc-d1-dev 2023-06-22 23:58:55 +00:00
Bill Yi
24a7a54341 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8fceb2c2cb46e03d76cab54b1348030cf61b788c
 2023-06-22 10:35:13 -07:00
TreeHugger Robot
0e8155050c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 1485ceaf97 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5f739553db37969ad0fc7434774e955ad1d0c24f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:59:05 +00:00
Bill Yi
8690fea740 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: 422c0622e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60b49aaa34df83762e56a7743600c6032407b5ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:58:54 +00:00
Bill Yi
1129578e20 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: 121dcd4d85 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1cd68986ddf7dc8f99151b7c14c0ba8029d67d5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:58:33 +00:00
TreeHugger Robot
0bc2775be5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours am: 2461b42f22 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I19e300e2539596017a10522a83594a465359bdf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:50:52 +00:00
Bill Yi
6ac2ee3478 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours am: b9ebaae7af -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I05a0c0cd78502c7a2a97ca05a1d5c00c26d35b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:50:39 +00:00
Bill Yi
ef507ad201 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours am: a0c53d9c73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0a53134f1c7b5b9267eb98157a8678ba19c64a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:50:20 +00:00
TreeHugger Robot
2461b42f22 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib99ea17012fbce64cda4b657b89941680fe34127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:11:33 +00:00
Bill Yi
b9ebaae7af [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I365f1efdc1ea9a7cb8affb6aecb77dd497eecd89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:11:21 +00:00
Bill Yi
a0c53d9c73 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic8c35b629548b57cf3363f2bd9a04611601af76a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:11:00 +00:00
TreeHugger Robot
1485ceaf97 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 3f85afaad5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I17a6c8a571b4a0b7d943dfd710cde0f18d03da39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:09:42 +00:00
Bill Yi
422c0622e8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 65122fc3d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib724a8c68b2b9ec7fb438719c227094605d3efac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:09:30 +00:00
Bill Yi
121dcd4d85 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 588001801a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I14a0dc3b2435e511beec62e65281374249e704f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-22 08:09:10 +00:00
TreeHugger Robot
3f85afaad5 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-22 07:13:52 +00:00
Bill Yi
65122fc3d2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaff205a3b097d4239074e483525f0ab12f97d493
 2023-06-21 16:33:47 -07:00
Bill Yi
588001801a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic6f318bc10b367849754f16f9c02a9aa75a24b74
 2023-06-21 16:32:09 -07:00
Xin Li
3e6b213e75 Merge Android 13 QPR3 
Bug: 275386652
Merged-In: I11e6110ba0b640be8b373d9afd45f806c005b05f
Change-Id: I885fdb1d60c595314c9f3ed229dc030a75edab00
 2023-06-21 15:16:07 -07:00
Bill Yi
5f9d65869f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours am: 41ce899068 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idd48d0d0a7244e67db5cb91f8f4e7c4add6fc926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 21:16:57 +00:00
Bill Yi
acfa136e4f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours am: 1e96e76303 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I27fccda70bd40937dd3c3a61d7439ee33bfaf05f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 21:16:51 +00:00
Bill Yi
7b7d2179cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours am: ea4210eaa2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ce7ae9227b53ec051f52a28612bab60883552e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 21:16:39 +00:00
Bill Yi
41ce899068 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c48ccb9155ac97fb569e13504dcd262970df059
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 21:01:26 +00:00
Bill Yi
1e96e76303 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If55db97addae5d0c38c1434b0b26229bc28a2f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 21:01:21 +00:00
Bill Yi
ea4210eaa2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0964084a146f7a227407ba55eaae3c280a7140cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 21:01:10 +00:00
Bill Yi
10c28a1865 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours am: 196592ee78 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3217abf67e6897a41654184ce95dd03f89f85c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:56:39 +00:00
Bill Yi
f0a38cd669 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours am: 1ca0379e99 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6469bb3e9c5fa3a3c3a500d07a537aeea5d7d2cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:56:32 +00:00
Bill Yi
61d2712697 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours am: e6bbf4c0ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2222153c8c5d4a23b17caa20efb6d25bc28a1c45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:56:23 +00:00
Bill Yi
196592ee78 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: bfde831c44 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b5c0743698cc167f7852176ed4f619cb515902b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:39:03 +00:00
Bill Yi
1ca0379e99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6072ca10ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I626aca749292a50a5c1eb0755d4801cefd85ca0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:38:58 +00:00
Bill Yi
e6bbf4c0ab [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b37162ce4a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic1355b8c0575e2d4cae4a1ebe2284d4fcbca5009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 20:38:47 +00:00
Bill Yi
bfde831c44 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-06-21 19:19:29 +00:00
Hao Dong
bf84218753 Fix delete face button disappear after reenroll 
Test: manual test - 1.enroll a face 2. delete the face and reenroll 3.
back to face settings page, the button is delete button instead of set
up button
Bug: 285806446

Change-Id: I6739296b0b099446489956f8f609c87600ffdaa3
 2023-06-21 18:45:40 +00:00
Matías Hernández
027f0a46ae Settings: don't try to allow NLSes with too-long component names 
* NotificationAccessConfirmationActivity (triggered through CompanionDeviceManager) -> Don't show the dialog, bail out early similarly to other invalid inputs.
* NotificationAccessSettings (from Special App Access) -> No changes, but use the canonical constant now.
* ApprovalPreferenceController (used in NotificationAccessDetails) -> Disable the toggle, unless the NLS was previously approved (in which case it can still be removed).

Fixes: 260570119
Fixes: 286043036
Test: atest + manually
Change-Id: Ifc048311746c027e3683cdcf65f1079d04cf7c56
 2023-06-21 17:02:32 +02:00
Bill Yi
6072ca10ec Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8c5e78d87373a142a4082f9081a28027d239af45
 2023-06-21 07:16:56 -07:00
Bill Yi
b37162ce4a Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ia31b10a26fde9ae0f51940ad59e4746ead5fa70b
 2023-06-21 07:15:19 -07:00
Automerger Merge Worker
8fd358b746 Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3cc206bb14 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: c8daf1ce7c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 9c5a967922 -s ours
 2023-06-21 06:55:07 +00:00
Treehugger Robot
36cab9526d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3cc206bb14 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ff5899979f4bdffa064bd4eaa2706093fe2e7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:53:59 +00:00
Bill Yi
392461bafb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: c8daf1ce7c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41df07bb40086c1f52f528b614575de6134aa41e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:53:46 +00:00
Bill Yi
d3bdcdbc9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 9c5a967922 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id76d8e9d67012b82f0c149f595b639d8ed66b06f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:53:30 +00:00
Treehugger Robot
ca92c010e4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours am: 3a3d7e41a3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40bae734e4825836daf95fb52359be9f013b7850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:51:44 +00:00
Bill Yi
4ea827c82c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours am: ed188e243f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f5976a6ea91615eadb80ba0ab9096c906e443a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:51:32 +00:00
Bill Yi
941771948f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours am: 5499c23607 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie7ec6dd549eea682bc9aa56475adecdd3834da48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:51:15 +00:00
Treehugger Robot
3a3d7e41a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I913ac0acef2a70a9e3619e380e8dcca3764451c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:37:23 +00:00
Bill Yi
ed188e243f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dd95a8a7c8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I06a42857f8ef4d119b5f0fc00a3a2b33e02ce715
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:37:18 +00:00
Bill Yi
5499c23607 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d0213cd684 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ida4fe997bc0b5c67ee638d5ae40ef97d4d9e4428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:36:53 +00:00
Treehugger Robot
3cc206bb14 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 8e3c231438 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6db3e162b26a8ab0355ba8c39834756850a89f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-21 06:36:44 +00:00