Commit Graph

127572 Commits

Author SHA1 Message Date
Bill Yi
7ab39a8004 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -s ours am: 69138bb411 -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: Ifde4dd061d681dc08de756a2b94489271ccefac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:54:11 +00:00
Bill Yi
44342d11a6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89d279b73f -s ours am: ef5d1eb338 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I561d1cb37debb6a9f1d630e4796d6f42d1d7e189
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:54:11 +00:00
Bill Yi
46814d48f9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -s ours am: 8e1bdee14b -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: I79644d3bb4806f38fee21fe15bb1e4e01bb655a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:54:02 +00:00
Bill Yi
5e5bd8a09e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 27da95cdb4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e0e9d5ac6359b370ef01f7c027c07081374a391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:47:42 +00:00
Bill Yi
3695fdacf1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9d671a4d3f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3bfe7a0ed0a2c2a74337046227a0f21e996deb73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:47:38 +00:00
Bill Yi
3ae666fcc8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: ac5600e4ae -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d08e936d739301edda681273d45ea379824ef57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:47:26 +00:00
Bill Yi
9f22de1bb4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 582cf66067 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09664de539e495362f0dfa5ea8e9afcc09e556bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:47:00 +00:00
Bill Yi
9242c61918 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -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: I41fca222ebb3906f8225c8a671a14a5b4d6cbde5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:39:37 +00:00
Bill Yi
b529ea9616 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -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: I34a0a0f1ffaddbdc6b0d1639a74a788850120146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:39:22 +00:00
Bill Yi
f111f3ebaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -s ours am: d1e4580468 -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: I417e044f04afa92da2c10f6c2f6451af71b9c158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:39:11 +00:00
Bill Yi
02a459ef67 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -s ours am: 96c5a8a5b1 -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: I9af72285812f4e48394a16eca9eb55d83e75b6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:38:56 +00:00
Bill Yi
6e55d384d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -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: I6833c827dad9b3a2b23a4b496b6f1b02538c78c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:36:57 +00:00
Bill Yi
47229f8506 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -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: I410eee080a6947deb730a79a3b957f1a9d548c0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:36:50 +00:00
Bill Yi
1e56c47970 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 4c82c3ca22 -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: I87b265870290e2ba46be1048c6dadd0991e3c084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:36:40 +00:00
Bill Yi
69138bb411 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -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: I8c383c2007edb1c4c565b75dc2634906c8e2a2ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:36:39 +00:00
Bill Yi
133ea630cd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e2b36788ee -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: I9048c6605fb90dcbc3d8f38496f0cdb5027d983a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:36:35 +00:00
Bill Yi
3515338e98 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2653ed9e80 -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: Ia0bc4d0595469b231aa915030fc9a01a2e1eb33f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:36:24 +00:00
Bill Yi
8e1bdee14b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -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: Ief5b22a304ee2bad275b87b4aeb9b6a33703239a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:36:19 +00:00
Bill Yi
67f2600f7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a30f4c565 -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: Ia06b1bcf0ec9ae5cc715f58c06f2a0dcc858105d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:36:02 +00:00
Bill Yi
f89feda95a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -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: I302a25ff6f386b4b533354fcb841abd01aa1d837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:31:32 +00:00
Bill Yi
5e19b2f723 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -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: I8c3bfd3ea0adab464df89bcb81b16470d388c580
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:31:08 +00:00
Bill Yi
d1e4580468 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b477262850 -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: Iaf83d1fe7c518ec6223b28e73135ed42fdfcd6e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:30:43 +00:00
Bill Yi
96c5a8a5b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dee2369371 -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: I36d2b7efe75a75b07423b475d9034450472e25a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:30:18 +00:00
Bill Yi
416c740992 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 51edefead1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8b0d0818625d29865ab39c882af5a8d82d6a2740
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:27:46 +00:00
Bill Yi
ea8c160bcb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 288b16d401 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I07ce2a9da9a793da128a6f44266b0b300733bdd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:27:39 +00:00
Bill Yi
b1988221ae [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 767e0cf13b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I17ea7dca4ca55d8255aed86f4d62546f9637304e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:27:27 +00:00
Bill Yi
ef5d1eb338 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89d279b73f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id6f5d5adbc4d5a4d8397b4a35edc647de4cd4413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:27:08 +00:00
Bill Yi
63642872a3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 51edefead1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I95cf04c45f01b303de24a947835cd162f88dd509
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:22:27 +00:00
Bill Yi
99876aa41c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 288b16d401 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8287c2c66df5bdd556f905c8b18d6120b345e758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:22:21 +00:00
Bill Yi
d7c62e21af [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 767e0cf13b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0de067bc616ef9260cf64a76aba0f125e609b401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:22:10 +00:00
Bill Yi
e68bb3f35d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 89d279b73f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03ebda76bc6105a01ac5509ecdcf6188b5878303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 18:21:46 +00:00
Bill Yi
27da95cdb4 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-08 17:48:49 +00:00
Bill Yi
ac5600e4ae Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-08 17:48:49 +00:00
Bill Yi
4c82c3ca22 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-07-08 17:48:12 +00:00
Bill Yi
2653ed9e80 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-07-08 17:48:12 +00:00
Bill Yi
51edefead1 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-07-08 17:47:46 +00:00
Bill Yi
767e0cf13b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-07-08 17:47:46 +00:00
Bill Yi
b477262850 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-07-08 17:46:44 +00:00
Bill Yi
423bcd8f09 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: fa69c12ccf -s ours am: 1ada34392a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I27a283b3e4d8f24b8bc17d60834786612e3e9fd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 07:20:21 +00:00
Bill Yi
18352185b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: c94da2c636 -s ours am: 96b299f598 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8beb03dcabdfbcc7fc0d4ceb5839f7b05c32da97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 07:11:31 +00:00
Bill Yi
89828a5b6a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: c94da2c636 -s ours am: 185fcf7f49 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic8a4a671c466ed34d3c42c928e5bfe79f9634797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 07:05:53 +00:00
Bill Yi
1ada34392a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: fa69c12ccf -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92aef852fec8869f09729a02985c8d1871908b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 06:29:23 +00:00
Bill Yi
185fcf7f49 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: c94da2c636 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d861f2db818b6dfb2d233487767b6ae4734c2f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 06:26:25 +00:00
Bill Yi
96b299f598 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours am: c94da2c636 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id51df568902f9b24edbe0d404bad511bbd2a0005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 06:26:24 +00:00
Bill Yi
fa69c12ccf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89189154b2726898efd4b7601a4e04b75d503b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 05:36:14 +00:00
Bill Yi
c94da2c636 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 654749ad92 -s ours am: bd4bc23a25 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I9071edeaea4d07ef36333f37acf5fec64440a9ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-08 05:10:31 +00:00
Eric Biggers
250f2727b0 ChooseLockPattern: remove redundant setting of visible pattern default
Remove the code that set LOCK_PATTERN_VISIBLE to true the first time a
pattern was set, since LOCK_PATTERN_VISIBLE now defaults to true when
unset (ag/22912136).  The explicit defaulting to true was only needed
before because the low-level default value was wrong.

Bug: 270013005
Test: Set a pattern.  Verified that Keyguard uses visible pattern.
      Disabled the "Make pattern visible" option in Settings.  Verified
      that Keyguard doesn't use visible pattern.
Change-Id: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
Merged-In: I63f29c68f9a508fee0ee2f03f2cca33317fb8a32
(cherry picked from commit 6c3de30086)
2023-07-08 04:04:01 +00:00
Chaohui Wang
590b4e7af8 [Regulatory Labels] Load labels from overlays
When config_regulatory_info_overlay_package_name is configured, load
regulatory labels directly from overlay package.

Also fix RegulatoryInfoDisplayActivity missing dialog theme.

Bug: 283170651
Test: unit test
Test: manual - check regulatory labels
Change-Id: Ia1f6848abe0da9facf34f47abab09e88d57e74d6
2023-07-07 14:52:26 +00:00
Treehugger Robot
135a612034 Merge "Do not show LE audio toggle in Device Detail by default" into udc-d1-dev am: 1f9f114495 am: 5da1b03545
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23898723

Change-Id: Ibdc96d4c167f63733093c75262aef945d2f106c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 11:27:09 +00:00