Commit Graph

108198 Commits

Author SHA1 Message Date
Jason Hsu
529e171efd Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d am: 37927b4f20 am: dd237f0e63
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039

Change-Id: I5712c4fd2b8d9428250440e73f7e95941a04370d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 14:26:53 +00:00
Jason Hsu
7fcf225d7b Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d am: 37927b4f20 am: 296fbcdcd6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039

Change-Id: I99710701befa344260421e7ab4efa3086730ecf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 14:26:34 +00:00
Julia Reynolds
627ef35473 Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 38addd9f8d am: ec99d3cbfb am: 2d1baf150b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I171e580fb6de336014c06dc44b9a637bd1f09a8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 14:23:26 +00:00
Julia Reynolds
82e930d789 Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 2d251eaa2e am: 265ac4148c am: e738ba64c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I0d54266e449ed978509d6f83d4847f9891fbf92c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 14:16:16 +00:00
Jason Hsu
2183a95926 Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d am: 18bd8436be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039

Change-Id: I9aced16203b608c6a590a56b48c43cb334f6d6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 14:02:14 +00:00
Jason Hsu
dd237f0e63 Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d am: 37927b4f20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039

Change-Id: I2705eda70ae39caca148594155224beb8609d55b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 14:00:44 +00:00
Jason Hsu
296fbcdcd6 Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d am: 37927b4f20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039

Change-Id: Iac7361e677d69b8244e62b68e7029fb52f34c62d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 14:00:41 +00:00
Jason Hsu
dfcdc1c0d4 Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d am: 02c981cf72
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039

Change-Id: I8f0d6fd15823d7235b651b11f2e6ae8b2fcafe6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 14:00:13 +00:00
Julia Reynolds
2d1baf150b Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 38addd9f8d am: ec99d3cbfb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: Iaef008e92f8e279edcbad4893cd17d079a3d0282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 13:52:07 +00:00
Julia Reynolds
e738ba64c7 Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 2d251eaa2e am: 265ac4148c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I169b8fe7ea1b6f45e57584f55fc2716457e80d5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 13:45:03 +00:00
Julia Reynolds
601157562b Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 2d251eaa2e am: e4c2786e46 am: da44b57637
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I842f5969cdf780fc369aa46ceee924bda79f2f11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 13:42:29 +00:00
Jason Hsu
02c981cf72 Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039

Change-Id: I2d11ef30a18d0def296dae9e7316b6eda378ce55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 13:34:22 +00:00
Jason Hsu
37927b4f20 Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039

Change-Id: Ic0e0538f7aa3cebc47edfb786011464a30f0d84f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 13:33:52 +00:00
Jason Hsu
18bd8436be Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev am: 76ae78452d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332039

Change-Id: I45e07bb1c1c74f1fe4c04f5fa04cd41f425168f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 13:33:32 +00:00
Jason Hsu
76ae78452d Merge "Correct Magnification shortcut title in edit shortcut dialog" into tm-dev 2022-05-12 13:14:46 +00:00
Julia Reynolds
da44b57637 Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 2d251eaa2e am: e4c2786e46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: Id0bf25115412110f41cff9e90fc2d35d980a5ad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 13:14:06 +00:00
Kuan Wang
2b3ed921b4 Add string "Battery usage settings" into Reset App dialog. am: a075405517 am: cfc3b93fb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332037

Change-Id: I0a1e225aa6a22efa889abbc6cc9ae17e492dd9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:59:16 +00:00
Julia Reynolds
ec99d3cbfb Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 38addd9f8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I5ae98057b021817ddd2e179d97ac8f1132f926a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:52:20 +00:00
Julia Reynolds
a384ff7560 Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 7a5c4459fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I91c3c1e7ffd221559a577a9b26314b874ac4ac08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:50:44 +00:00
Julia Reynolds
e4c2786e46 Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 2d251eaa2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: Id48b84971ef57eed3352539021af0f077febc683
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:50:06 +00:00
Julia Reynolds
265ac4148c Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3 am: 2d251eaa2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I215afd39c21e68812732bbc02f9178e621782995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:49:24 +00:00
Kuan Wang
cfc3b93fb7 Add string "Battery usage settings" into Reset App dialog. am: a075405517
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332037

Change-Id: Iaa841bf77a1cbcc08d9a49af856232082a7987b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:39:13 +00:00
Julia Reynolds
7a5c4459fb Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I9b41b808e6613c6bc730319909567c6664f36599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:28:09 +00:00
Julia Reynolds
2d251eaa2e Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: I43fe4faf8494593743293333756a142d256eddf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:27:10 +00:00
Julia Reynolds
38addd9f8d Merge "Use NMS calculation of fixed importance" into tm-dev am: 9372f3b4e3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18288425

Change-Id: Ief0ddf880d27a11b693bd01a1a6f7c033b8b4cad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 12:26:54 +00:00
Kuan Wang
a075405517 Add string "Battery usage settings" into Reset App dialog.
Bug: 222037028
Test: emulator
Change-Id: I5482de6573d34533db35c82136af13c03a34b7ab
2022-05-12 12:13:25 +00:00
Julia Reynolds
9372f3b4e3 Merge "Use NMS calculation of fixed importance" into tm-dev 2022-05-12 11:55:40 +00:00
jasonwshsu
87e0b3c7e5 Correct Magnification shortcut title in edit shortcut dialog
Root Cause: Magnification has its own edit shortcut dialog, but we did not
update correct title with getShortcutTitle()

Solution: set dialog title to getShortcutTitle()

Bug: 231531313
Test: manual test
Change-Id: I0679be2807a4b1f8b8a733604e16a35b0a1258c3
2022-05-12 17:33:07 +08:00
Jason Chiu
13232f0bb7 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 4aad83a270 am: 72c259c604 am: 85353ab218
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: Ia996d6e2fdfdfba8eb7f4939a3ab899b1eeb929a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:34:26 +00:00
Arc Wang
3b6f843aac Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 69bfb2ad1a am: 4fb73340bd am: 7b1c65cfbb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I0c8290637bab6095068a24cd5bc5979055fb85a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:29:37 +00:00
Milton Wu
9ac85225b6 Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 8f3f848b6e am: e0a395afe7 am: 75a1650ca5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: Ifcd0d1886d2fec9b487c099ee03d4ca7397f2119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:18:10 +00:00
Arc Wang
f81a4817f2 Show USB flash drive in storage spinner when it's unmounted
Before this change, USB flash drive is removed from storage spinner
when it's unmounted (by option menu 'Eject'), however, USB flash
drive will show in storage spinner when Storage Settings page is
resumed again.

After this change, USB flash drive will show in storage spinner
even if it's unmounted. It will be removed until it's unplugged
from device.

Bug: 225095144
Test: manual visual
      Insert / Eject / Mount / unplug an USB flash drive and
      observe UI behavior.
Change-Id: I6b81766216c7850b018997f2de12a19d9d8675be
2022-05-12 16:17:12 +08:00
Automerger Merge Worker
1267556e7c Merge "Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: 5cea4fc4a1" into tm-d1-dev-plus-aosp am: 1f2cc00083 am: db476f23be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I76a1292736ac7174afb37e30e1e4f54e007fd46c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:14:52 +00:00
Jason Chiu
aac10a5cc0 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 31b8a1eeb7 am: f10d8ebd68 am: db01ec9185
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: I56b21cfba7242ef0d2bb9806aa3541dbb36939e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:11:37 +00:00
Arc Wang
4945971c63 Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 0bfff4cabb am: b3c53f061e am: 8582bbbba9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I7c8312e79c9526ed2e16cfe9f81603afea362a95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:04:33 +00:00
Milton Wu
cd2cf81101 Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 41a960559d am: a9bbf4069e am: 2a5584ef81
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: I842bcd33eb82d29b830134de5e471e1b555c194a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 08:00:49 +00:00
Jason Chiu
b5f312b41e Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 4aad83a270 am: fdd88bc220 am: 3724a50eed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: I1fee7c23090b8331a4b2354929295351239a1b93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:54:13 +00:00
Arc Wang
504dc5e136 Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 69bfb2ad1a am: 0d9772691e am: 2001b2d0d1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I6bb99170d42b44a082bb14a3b532d8ede53c6017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:44:22 +00:00
Automerger Merge Worker
438c05f619 Merge "Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 8f3f848b6e am: 20cae9f9fd" into tm-qpr-dev-plus-aosp am: 0381113833
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: I4ee7ab2ebae033cd78e1b190122ab2755c5727fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 07:31:27 +00:00
Peter_Liang
9b09c57578 Fine-tune the location of the logging for accessibility text and reading options.
Goals: To have the precise logs, move the previous logs to the proper location.

Bug: 222661478
Test: manual test
Change-Id: I74d99659d2b383222b381c430c3c373879f5cbdc
2022-05-12 15:09:04 +08:00
Yi-Ling Chuang
2fd14afaf5 Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: ccc866a16f am: c1fd1de25b am: 4013f6cbd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I9751fd8ca7ee20d6c2ca3452f45ba7946dd95a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 06:56:20 +00:00
Yi-Ling Chuang
9ff55bbc1e Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: 5cea4fc4a1 am: ab39e074a3 am: 5117debec9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I204b5ac6d1d31b89557f07cc9b09fb7b725627f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 06:38:32 +00:00
James Lin
32310518ff Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: 97cfcae36d am: c34fce8adc am: 722244a95a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I08691fd6ce9c567212eae725bc232d8d13d72fbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 06:26:25 +00:00
James Lin
29c90e879f Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: c7eea3d1b7 am: 99d0a952f2 am: c8015dd2c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I5d9aca99019fa27e247d67ab3e772b115fafba0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 06:03:34 +00:00
James Lin
8105b9e4d8 Merge "[Panlingual] Remove the warning message from AppLocaleDetails" into tm-dev am: 14c7ce7ccb am: c7eea3d1b7 am: ad62f6a29e am: a2b22c3a3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281654

Change-Id: I5939f2d3f8f91dc2df9561a100a8c34b7f67a349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:37:26 +00:00
Jason Chiu
85353ab218 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 4aad83a270 am: 72c259c604
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: I60666d453e564399de402bd58aa266df2633a4e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:08:23 +00:00
Arc Wang
7b1c65cfbb Merge "Storage Settings crash" into tm-dev am: 241238c6df am: 69bfb2ad1a am: 4fb73340bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18234988

Change-Id: I6dd0f76ebf76ba59cf599dbb97970ba9d94cacf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:08:15 +00:00
Milton Wu
75a1650ca5 Merge "Recreate fingerprint setup if degree 0 to 180" into tm-dev am: bd31deb476 am: 8f3f848b6e am: e0a395afe7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309251

Change-Id: Ie2aecbc5336dad265bf59a476b95573aa4438a10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:08:08 +00:00
Automerger Merge Worker
db476f23be Merge "Merge "Make the force stop dialog work properly in split screen" into tm-dev am: f6c416054e am: 5cea4fc4a1" into tm-d1-dev-plus-aosp am: 1f2cc00083
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18281655

Change-Id: I551bc73b74eb68f5733849c529355b6cb9e13712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:08:02 +00:00
Jason Chiu
db01ec9185 Merge "Add summary strings of "Tips & support" for tablets" into tm-dev am: 56c7f91cea am: 31b8a1eeb7 am: f10d8ebd68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18309253

Change-Id: Id1d42d1bbf36ef756487587be7ee04428732002b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-12 05:07:53 +00:00