PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
127,402 Commits 1 Branch 0 Tags
486451e9cf7ef63b51fdcf567c09d1058ca01b50
Commit Graph

127402 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Taran Singh
e11d0e8502 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 76b536abc8 -s ours am: 76f3f2efe8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I18a4da8fdf54ba0ffb11f79beceaa8721b01e431
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:39:06 +00:00
Treehugger Robot
66539a3cda [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into sc-qpr1-dev am: e5f9ab14ce -s ours am: 2c62993aca -s ours am: 71bf0d7467 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8d3021b6416c446432b38dabdeff2e566831cc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:38:50 +00:00
Taran Singh
7fa313e00e [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 27a97f4583 -s ours am: a8bd8948d1 -s ours am: 02ef9c46ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a89c8243a4f40b07a61724747757039741ddc97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:38:48 +00:00
Treehugger Robot
000cdf1b5d Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-dev am: 8e3d6f0a10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: I79b66024b8a6411f289270d19416d08849c81746
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:38:21 +00:00
Taran Singh
fdf0f64b90 DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: I46dae6492ca7512344dee008c782f20a49f700e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 10:38:16 +00:00
Bill Yi
05c15f8e73 Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE 
Merged-In: I2d14107a37340b8b34ae71c67f7f705a272324b9
I2d14107a37340b8b34ae71c67f7f705a272324b9
Merged-In: I302a25ff6f386b4b533354fcb841abd01aa1d837
I302a25ff6f386b4b533354fcb841abd01aa1d837
Merged-In: Idd06d93032c0616c59f6f9738a2f5dea9fc9e53c
Idd06d93032c0616c59f6f9738a2f5dea9fc9e53c

Change-Id: Ie7d523720aff6d3ac1879130df097474e417d215
 2023-07-11 15:30:02 -07:00
Joshua McCloskey
b7f0d7a8ff Moving FingerprintSettings to Kotlin 
This change is the first of many, it will

1. Change java -> kotlin
2. Use the MVVM architecture
3. Be feature flagged

This change in particular is focused on transitions to and from various activities.

Enable feature via
adb shell setprop sys.fflag.override.settings_biometrics2_fingerprint true

Bug: 280862076
Test: atest FingerprintSettingsViewModelTest
Change-Id: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
Merged-In: I8eb5c30e6f2e92c256ae7c257a9d560439ba418f
 2023-07-11 17:43:07 +00:00
SongFerng Wang
340d592bbf Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev am: 997ef1e5b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24018266

Change-Id: Iac910dd53cfa1ee4b67548d7cfd025c6809a88e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 14:14:27 +00:00
SongFerng Wang
997ef1e5b3 Merge "Revert "Revert "Update the wording for LE Audio""" into udc-qpr-dev 2023-07-11 13:33:14 +00:00
lbill
7f8197da82 Update screen lock and biometrics options in order 
Previously the screen lock and biometrics order is :
UI & UX: b/182806496, b/183649070
- PIN • Face • Fingerprint
- Pattern • Face • Fingerprint
- Password • Face • Fingerprint

By requirement, we need to reverse Fingerprint & Face position
- PIN • Fingerprint • Face
- Pattern • Fingerprint • Face
- Password • Fingerprint • Face

Also remove unused strings

Fixes: 242143765
Test: Manual login corp, and observe the UI in Choose screen lock
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.password
Change-Id: I1938f867360512121ecfdae8e2ca6de7002156f4
 2023-07-11 12:30:22 +00:00
Daniel Huang
73b2b137cc Merge "Use EXTRA_ENTRYPOINT to log entry point for metrics" into udc-qpr-dev am: 2b40635f07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913078

Change-Id: Iad5339178401ca44b5e36f16e9509efec088c3b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 09:18:48 +00:00
Chaohui Wang
d9e7141a78 Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a am: 1806b3032f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: Ia06c3c91c64a40300f0468ab0cc6208a169bdbdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 09:18:22 +00:00
Chaohui Wang
fc275fef2e Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a am: 47803f6b10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: I624e8cf060dae2dfb7a1b0b06c4610adeeddde79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 09:12:13 +00:00
Daniel Huang
2b40635f07 Merge "Use EXTRA_ENTRYPOINT to log entry point for metrics" into udc-qpr-dev 2023-07-11 09:09:03 +00:00
Chaohui Wang
1806b3032f Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: I46c9e35554f3a7021bb52c79cc73e09971ca4232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 08:34:42 +00:00
Chaohui Wang
47803f6b10 Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev am: fe38ff963a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23939155

Change-Id: I159db196a31270e20a213796e8236eb9808d418a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 08:30:00 +00:00
SongFerng Wang
513f38cb17 Revert "Revert "Update the wording for LE Audio"" 
This reverts commit c123b2e5a8.

Reason for revert: Since the phase 2 launch plan was moved to next timeline at b/289884263.

Change-Id: I54ff20c0d9599da7f47e2254f721be6007a9204a
 2023-07-11 08:20:23 +00:00
Chaohui Wang
fe38ff963a Merge "[Regulatory Labels] Load labels from overlays" into udc-d1-dev 2023-07-11 07:50:49 +00:00
Treehugger Robot
5c046f1d4e Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev am: 4ac05f8cac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23971085

Change-Id: I32334ef24562e212e8817df7792b386a61f822f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:52:26 +00:00
Treehugger Robot
4ac05f8cac Merge "Add a mechanism to log battery usage periodic job events" into udc-qpr-dev 2023-07-11 06:09:54 +00:00
SongFerng Wang
dbeb0fb911 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: d3f8caa506 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: I871b3e1f3e66d9de564d1761bc160b9e5ea1e0da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:07:56 +00:00
SongFerng Wang
723c5e8754 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f am: 96c2da1340 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: I2f10b967b2b98903e7bba9a9e0a74ab02ce1a8e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 06:02:24 +00:00
SongFerng Wang
d3f8caa506 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: Ifd57844fa7d17836a8c681b16b8b7e1830aabfec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:26:45 +00:00
SongFerng Wang
96c2da1340 Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev am: 717ce2b91f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23913080

Change-Id: Iabad339cd438114562b16a495f2e9c15249c38b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:22:21 +00:00
SongFerng Wang
717ce2b91f Merge "To fix waiting too long issue when psim -> esim" into udc-d1-dev 2023-07-11 04:55:18 +00:00
Chun-Wei Wang
05dc85a094 Merge "ChooseLockPattern: remove redundant setting of visible pattern default" into udc-qpr-dev am: c680da15c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23988224

Change-Id: Icc8a1a86241bc4e41e77e72c1d69f8d7d3d92c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 04:04:17 +00:00
Chun-Wei Wang
c680da15c3 Merge "ChooseLockPattern: remove redundant setting of visible pattern default" into udc-qpr-dev 2023-07-11 03:24:17 +00:00
Joshua Mccloskey
1c7a298038 Merge "Moving FingerprintSettings to Kotlin" into udc-qpr-dev-plus-aosp 2023-07-10 19:02:01 +00:00
Chaohui Wang
057c15c26a Fix crash when call getMobileTemplate am: 9132535e5e am: 1578772d63 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I9d6300da831dff79e2ae605e59d3a3af41f48c97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 09:02:44 +00:00
Chaohui Wang
dc3fc1dff0 Fix crash when call getMobileTemplate am: 9132535e5e am: f3d6684e14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ifbeab53d402207c0cd63ab225f30af6bdc4da824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:56:59 +00:00
Chaohui Wang
1578772d63 Fix crash when call getMobileTemplate am: 9132535e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: I01c40793839a7d5fbd0b7834c67184c228356c0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:16:04 +00:00
Chaohui Wang
f3d6684e14 Fix crash when call getMobileTemplate am: 9132535e5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24002328

Change-Id: Ia4b74067049da536c8f98230e588b579379fdad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 08:12:07 +00:00
Zaiyue Xue
c93fe0b509 Fix testUidCache_switchLocale_shouldCleanCache in BatteryEntryTest 
Remove unused code and test

Bug: 290318160
Fix: 290318160
Test: presubmit
Change-Id: I20c612270c67f55e0b01fa849514ba670b696db3
 2023-07-10 15:06:57 +08:00
Chaohui Wang
9132535e5e Fix crash when call getMobileTemplate 
There are 2 versions of getMobileTemplate.

The previous Change I7865823d6af2c812afa35d047bd79b60ae4b0fb7 change
from the correct version to the wrong version.

Change back to fix the issue.

Fix: 290381395
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: Icb3147558176d53dc77e7bd39ab54a5dad13c12b
Merged-In: I6227f973ec38e5b0520f54a41ac2ede2929a1bcc
 2023-07-10 14:20:07 +08:00
Jason Chang
17d1e70930 Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev am: 5a0d4d1cc3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712165

Change-Id: I8c58292e2b93f0e827d059c44046002d72eb772b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 03:41:17 +00:00
Jason Chang
5a0d4d1cc3 Merge "Fix the “screen lock option” and password restriction view are in the wrong position on PIN/Password/Pattern in the landscape mode." into udc-qpr-dev 2023-07-10 03:06:07 +00:00
Bill Yi
d148a02796 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: f89feda95a -s ours am: 7e7dbde91c -s ours am: 03378d121f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4f9f1172cb7d53b381e8fe63ea4090d6c1fa4622
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:41:59 +00:00
Bill Yi
bed14260bb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 5e19b2f723 -s ours am: fef711a1be -s ours am: 2e914d0f97 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1dd6313f25fb074342731a44d3e711b06f075bc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:41:45 +00:00
Bill Yi
f0e9f6102d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: 9242c61918 -s ours am: fc779544aa -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3a07c8817b15adb5153bff2c20c8ea0351b2c808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:40:30 +00:00
Bill Yi
ee360ca80c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: b529ea9616 -s ours am: 5679d090e2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I46d6a6e7fef51d6487f676a9e12348d81a54a660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:40:12 +00:00
Bill Yi
2c4950cb81 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -s ours am: 1e56c47970 -s ours am: 795c1d48bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I12995ac38ff9f5e276008a3b930b3700908c6c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:21 +00:00
Bill Yi
67de158d99 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -s ours am: 133ea630cd -s ours am: d3fe40fc73 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebdbece454fe0d5d68c56f063b4fb415e24e0857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:12 +00:00
Bill Yi
b61219c22f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 3515338e98 -s ours am: 0569968d37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia67b71092f7748a37cb154bdfe6b1ed26d8c34a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:58 +00:00
Bill Yi
7ab37f4a48 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 67f2600f7d -s ours am: ab5f054b40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I145b1578f94f580c84236cc645453bdf5669e29e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:44 +00:00
Bill Yi
03378d121f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: f89feda95a -s ours am: 7e7dbde91c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9e574dc0d2fb7fea72a36c0ff2fa37cd0a28353a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:27:39 +00:00
Bill Yi
2e914d0f97 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 5e19b2f723 -s ours am: fef711a1be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c5a53fb08611551eccb6ddf0040b6996d92da56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:27:24 +00:00
Bill Yi
fc779544aa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: 9242c61918 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice8c5c0ebfd6fd41669a22e4d4fb83857d6e40fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:26:13 +00:00
Bill Yi
5679d090e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: b529ea9616 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icbd0a63cb491eb64eeb98c964bcb1a9ecc46e3ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:25:58 +00:00
Bill Yi
02e9928931 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -s ours am: f111f3ebaf -s ours am: 852ae30fee -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If212d916de0af6b9eb8f3c5ba121097f12250334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:25:58 +00:00
Bill Yi
b91957c3f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -s ours am: 02a459ef67 -s ours am: c732e1f988 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5441b78221a2ba4f5817168522dbcfee74e1ea07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:25:47 +00:00