PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
106,818 Commits 1 Branch 0 Tags
daefa66c33ecf0d0d9eb696812fa8affd497a46c
Commit Graph

106818 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
1811ddabe3 Merge "[Panlingual] Fix conflict am: 70fe2d1fdd am: fd09e5c0e8" into tm-d1-dev-plus-aosp 2022-05-05 09:27:29 +00:00
Tsung-Mao Fang
8998aeb1fc Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 am: a0100b2171 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: Ieed25319883b72568c1b1c1421452a49578840ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:24 +00:00
Tom Hsu
e8e612c7d5 [Panlingual] Fix conflict am: 70fe2d1fdd am: fd09e5c0e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: Ice1bd20d3282d30e53e8bb150bc59437144bd02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:27:22 +00:00
Tom Hsu
e74b7edb7c [Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I8154923e9e3db1e4984889d648cf0cfa17e65348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:26:43 +00:00
Tom Hsu
1c154f9197 [Panlingual] Fix conflict am: 70fe2d1fdd am: c4603be5b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I0bd679552d03be99daf1e31d120626cc8b9d4ff0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:26:24 +00:00
Jonathan Scott
b7f4f56cad Add missing settings strings. 
Also re-enable and fix tests.

Test: manual
Fixes: 226183482
Fixes: 218799125
Fixes: 219375624

Change-Id: I9605f1f4e2e834baf63e015e96639567c5481b5f
 2022-05-05 09:12:59 +00:00
SongFerng Wang
e00cbc7885 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: I051e905d4a216f57aa2b9244cf93df203b6e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:25 +00:00
SongFerng Wang
411d3acb66 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: Ifeb0c8ee95410f9555650078a396ca0728fb9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:22 +00:00
SongFerng Wang
8c7cda2140 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: I52b9d8caaa3791005a326f172cf420c152b7fced
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:09:21 +00:00
Tsung-Mao Fang
c1fe17de0d Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I5aa6e5fd95e3b5084f36427ec05bf4224dc28c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:57 +00:00
Tsung-Mao Fang
a0100b2171 Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: I8a5a602eb88c8947ad1ba293e3477e05d5c99ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:53 +00:00
Tsung-Mao Fang
c4613ab0d2 Merge "Show slice without toggle when there's no wifi permission" into tm-dev am: c5153183d8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030884

Change-Id: Ib1f9f1895b7555b0a1fdcb42679a12707bbc167b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:40 +00:00
Tom Hsu
c4603be5b3 [Panlingual] Fix conflict am: 70fe2d1fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I73dc18b9f3d456cc1c3569be593f0bec37b61e44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:28 +00:00
Tom Hsu
370840ff0d [Panlingual] Fix conflict am: 70fe2d1fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: Ic12ae1bc5e26bb8ef10351eb190224eea7cde869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:23 +00:00
Tom Hsu
fd09e5c0e8 [Panlingual] Fix conflict am: 70fe2d1fdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181644

Change-Id: I51b5f3f60061e41217b277e03686f43fbf85e885
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 09:08:02 +00:00
SongFerng Wang
afe6d302e4 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev 2022-05-05 08:50:20 +00:00
Tsung-Mao Fang
c5153183d8 Merge "Show slice without toggle when there's no wifi permission" into tm-dev 2022-05-05 08:43:00 +00:00
ykhung
be10538a09 Support special tethering and removed apps UID in the usage list 
There is a special UID for network data tethering usage, we will handle
it in a special case to avoid the current rule considering it as an
invalid UID case without showing in the usage list. We will disable the
click behavior to protect the optimization mode page first.

Bug: 227395125
Test: make RunSettingsRoboTests -j56 ROBOTEST_FILTER="com.android.settings.fuelgauge"
Change-Id: I8d96473d382ebc3253748cce8345d6f2261a233d
 2022-05-05 16:17:41 +08:00
Milton Wu
130a64779e Fix Learn more link not work 
Old span text shall not be used in preference footer. Change
implementation to use footer learnMore APIs

Bug: 228101275
Test: Make sure "Learn more" can be clicked on Fingerprint setting page
Change-Id: Ied2326b1a75fc02e7a3fe2321735f2f9f5ac066f
 2022-05-05 15:15:48 +08:00
Tom Hsu
70fe2d1fdd [Panlingual] Fix conflict 
- sync code from master to tm-dev

Change-Id: I75b66cd2fa161a6e7c8a9d272b67516ac55e7025
 2022-05-05 06:18:22 +00:00
Automerger Merge Worker
4188b5ca02 Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 1737ce56fc" into tm-d1-dev-plus-aosp am: 363b525796 am: 9568888182 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I108af047fae253872a79bac67111ca98d2496744
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 06:07:51 +00:00
Automerger Merge Worker
24ddac3238 Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 62715a9cdd" into tm-qpr-dev-plus-aosp am: a47e5c7bbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Id1df15eddbf23d039dfd88c4a0974773df08aeaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 06:06:55 +00:00
Daniel Huang
257a6052ab Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 03a2775a32 am: e5effd7edf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I85397a27a6cd8e62a38f029ad4e9d45de0ff062e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 06:05:41 +00:00
SongFerngWang
1709c80eff [LE broadcast sink] Add the source list in boradcast sink UI. 
Add the source list in boradcast sink UI.
Add the password dialog.

hsv link1: https://hsv.googleplex.com/6256032201310208
hsv link2: https://hsv.googleplex.com/5934966820044800
hsv link3: https://hsv.googleplex.com/6238095344140288
Bug: 228258236
Test: manual test

Change-Id: I698c2f7aba9baa9f143a98629b8796eda57fb379
 2022-05-05 06:00:45 +00:00
Automerger Merge Worker
9568888182 Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 1737ce56fc" into tm-d1-dev-plus-aosp am: 363b525796 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: If4ce8103ba2da3e8608356f762a2e78fe8f8acf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:48:22 +00:00
Automerger Merge Worker
a47e5c7bbc Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 62715a9cdd" into tm-qpr-dev-plus-aosp 2022-05-05 05:47:41 +00:00
Daniel Huang
af42043a93 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 62715a9cdd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ifa74be8b635a6f4abcf8a0c8ca137be04a85110a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:47:38 +00:00
Daniel Huang
e5effd7edf Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 am: 03a2775a32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I53c0555f4a325df7bddf2a309c02521716cbfd76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:47:37 +00:00
Daniel Huang
62715a9cdd Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ic91f10bc276e2d108739cbfc8df5b115e2fdf667
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:26:25 +00:00
Automerger Merge Worker
363b525796 Merge "Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 1737ce56fc" into tm-d1-dev-plus-aosp 2022-05-05 05:26:24 +00:00
Daniel Huang
03a2775a32 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 9a339e9d16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ife440db792f001864f3305eed6e3e2200e269d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:26:18 +00:00
Daniel Huang
e7490f41a3 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 am: 1737ce56fc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ib25ff5bf58f9b3bee0d414e5fe71e38b80c97fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:26:18 +00:00
Daniel Huang
9a339e9d16 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: I1384bf966c0afc391f97d64c389747fe307497cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:09:48 +00:00
Daniel Huang
90292ac568 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ic87b8e0584bae55115e5bc791ceccc3c2c81548e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:08:32 +00:00
Daniel Huang
1737ce56fc Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev am: 74b1027fe2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18158867

Change-Id: Ifb20f828c374e2a003d9d0b0f6af98ab50810afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-05 05:08:22 +00:00
Tsung-Mao Fang
cb641fa6eb Show slice without toggle when there's no wifi permission 
When the presenter app doesn't have certain permissions,
it's safer to go with a generic fallback slice
which just redirects user to the actual settings page.

Test: test on the presenter app. robo test
Fix: 178014725
Change-Id: I6f5358af2e00cb2fedba0b3f1474a026135986c6
 2022-05-05 12:05:38 +08:00
Daniel Huang
74b1027fe2 Merge "[Panlingual] Unit test for onLocaleSelected" into tm-dev 2022-05-05 03:46:47 +00:00
Joseph Oh
a9f4f09626 Merge changes from topic "tc_change_21" into tm-dev am: 261936eccf 
Bug: 231491884
Change-Id: I5c16cee342da0541c5f2540c6fdc417e668fe0f4
 2022-05-05 03:23:25 +00:00
Jay Thomas Sullivan
5efeddcdbe Add PRIVACY_ADVANCED_SETTINGS intent 
Redirect intent actions for PRIVACY_ADVANCED_SETTINGS to the privacy
screen.

Rationale:

1. The existing PRIVACY_SETTINGS intent will later be redirected to
   safety center, but

2. We will still need a way to intent to this screen, because this
   screen will be re-used and renamed to "More privacy settings", also
   known as "Advanced privacy settings"

Test: manual
Change-Id: I83cb3935e16887683f3907d9d71ccd7c53e24202
 2022-05-04 22:14:12 +00:00
Xin Li
fb06539bae [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours am: 9895e8e63b -s ours am: e5d25d91a6 -s ours am: c451743c29 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I0fac990f4261bcab21be06570a3ea2680c2abe6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 22:08:10 +00:00
Xin Li
c59d502f3b [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours am: 6c49c6dbcd -s ours am: 92e90faa5c -s ours am: 14807f68b6 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Ib6269ab9480935bf645a44a4f09567333bd6be57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 22:07:59 +00:00
Xin Li
c451743c29 [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours am: 9895e8e63b -s ours am: e5d25d91a6 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I1970ab4a3c30e9b7b07691b0764bf8227ab931b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:50:32 +00:00
Xin Li
14807f68b6 [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours am: 6c49c6dbcd -s ours am: 92e90faa5c -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I700946ecc115f36ee95ca5ed94c268cb9000324a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:50:21 +00:00
Xin Li
e5d25d91a6 [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours am: 9895e8e63b -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I89ef935da4e4cd866d0300ab387aff6a1ef23072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:28:29 +00:00
Xin Li
92e90faa5c [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours am: 6c49c6dbcd -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I20d6a10afd7b33ce095b5d1b847995d64d1a0b8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:28:18 +00:00
Xin Li
9895e8e63b [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours am: 2a6d8885bc -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I9ee9deabfbe58ece7df81f88733417d5b733898b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:20:20 +00:00
Xin Li
6c49c6dbcd [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours am: 90645fb925 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Iec2ab168e50ca7aecbe67626131c46b7d576a439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 21:20:09 +00:00
Xin Li
2a6d8885bc [automerger skipped] Merge "Merge SP2A.220505.002" am: 8adb561455 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: I1328a5b1eec08a2d30940f610911af8978153c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:57:11 +00:00
Xin Li
90645fb925 [automerger skipped] Merge SP2A.220505.002 am: c3a9ea7443 -s ours 
am skip reason: Merged-In I1def7b37184d6d81f29a5e6e4793b92012dacd9b with SHA-1 bc4fd99ddb is already in history

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

Change-Id: Ib4481f34e89f88b1a74baebdc5499460fe10b2e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:56:53 +00:00
Bill Yi
e1511c2982 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8c0d18ada4 -s ours am: 7034e737b6 -s ours am: 5a078b4970 -s ours am: 4d6d37508c -s ours am: 87a93a66d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia62ab8a79980ecd2beaa6f958d53f65fc2059ea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-04 20:32:43 +00:00