Speth Chang
63e8506de7
Remove camera multicam property setup am: bb425b2b20
am: 98919486a4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23083156
Change-Id: I9884b64fcae688b2bb8f2e68aeff0b0c27ee5f0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 08:56:49 +00:00
Speth Chang
23d6edacbc
Remove camera multicam property setup am: bb425b2b20
am: 33be60e157
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23083156
Change-Id: Ib3b18e64e146bbe5788d6144991443f80c2cec26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 08:56:15 +00:00
Speth Chang
98919486a4
Remove camera multicam property setup am: bb425b2b20
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23083156
Change-Id: I8414950750592e279daf99f5d534ec4f8687edb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 07:52:38 +00:00
Speth Chang
33be60e157
Remove camera multicam property setup am: bb425b2b20
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23083156
Change-Id: Ic5674b306ac211d6d45d6fd64fa43a16a04da4a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09 06:17:50 +00:00
Jiaming Liu
fb95508be5
Disable WM Extensions on Pixel 7
...
Bug: 266196089
Test: Build
Change-Id: Iebd3b9ab6b1bb5acbfa680faf844d86c5d9c9f57
2023-05-09 05:49:54 +00:00
Speth Chang
bb425b2b20
Remove camera multicam property setup
...
The property was re-named and default enabled.
Bug: 281468569
Test: build pass
Change-Id: Icd8da06ea8ad4546b62d33c533749d77a4ec4558
2023-05-08 11:18:10 +00:00
Charles Chen
df03345b90
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: a590a62938
am: 71acd23623
am: b674927b0c
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: I010269cf698dd704c137e222dcab84ac493c0f90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 08:35:13 +00:00
Charles Chen
026862fa6f
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: d177768af3
am: 7f2d8784e4
am: ef64096ea5
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: Icaf39cfede70840656d5da9db0113526c7ef754b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 08:34:45 +00:00
Charles Chen
beb7adff1c
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: a590a62938
am: 9679e885c1
am: a7e77b17da
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: Iba1efd7f21d7241478ea07a17daa3722335bf281
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 08:34:14 +00:00
Charles Chen
b674927b0c
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: a590a62938
am: 71acd23623
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: Id8671adcbec29892820560c1829b718d73eba0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:52:36 +00:00
Charles Chen
ef64096ea5
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: d177768af3
am: 7f2d8784e4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: I6021de961e1103b7cd456cc2bf6b17b60f5c1784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:47:38 +00:00
Charles Chen
a7e77b17da
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: a590a62938
am: 9679e885c1
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: Ib01aedefedaa49f3e7406d0160fcf7afc447069a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:47:11 +00:00
Charles Chen
7f2d8784e4
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: d177768af3
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: I78a5ca6bf277813d0a1bbd9c492d8d1e6bf63c94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:09:55 +00:00
Charles Chen
71acd23623
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: a590a62938
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: I90d482bf1f6441a3940160f251100d66b2f961c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:09:22 +00:00
Charles Chen
9679e885c1
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: a590a62938
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: I70fc06fd026d04c81548418baee0a8ff68a65264
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:05:28 +00:00
Charles Chen
def796f73d
Revert^2 Disable Settings large-screen optimization am: 653f25765f
am: 678adb8649
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: Ifb2375e65698cbf8f7c9571bcc831a65d39727f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 07:05:27 +00:00
Charles Chen
a590a62938
Revert^2 Disable Settings large-screen optimization am: 653f25765f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: Ia50b8b9931fcf2087e73deb89eb468dd7459c7e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 06:27:59 +00:00
Charles Chen
678adb8649
Revert^2 Disable Settings large-screen optimization am: 653f25765f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: Id587337cfccd8261853e12c96a3b62fd158b1f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 06:27:53 +00:00
Charles Chen
d177768af3
Revert^2 Disable Settings large-screen optimization am: 653f25765f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/23036418
Change-Id: I0964ced9e59c13923fc799a9f0c83c61d4b7d58a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08 06:23:42 +00:00
Charles Chen
653f25765f
Revert^2 Disable Settings large-screen optimization
...
Disable the optimization that is automatically enabled when
including Window Extensions through Activity Embedding.
The optimization causes to launch an additional trampoline
activity for deep links, even when the screen size is smaller
than required by Activity Embedding rules.
Bug: 267725145
Bug: 279461170
fixes: 280606740
Test: Build, perf metrics
Test: atest LauncherIronwoodIntegrationTests:android.platform.test.scenario.launcher.integration_tests.HomescreenCustomizationTests
Test: atest SettingsMultiPaneDeepLinkTest.java
Test: run v2/aep-ironwood/suite/test-mapping-ironwood-p0-cujs via ABTD
on cheetah/oriole/panther/raven in udc-dev/master branch
Change-Id: I532ebbcdc93f13c8d4cf956b53b498be907c4349
2023-05-08 05:39:06 +00:00
Bill Yi
ac3a3f343f
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: c25270ff98
-s ours am: ec5f7e0cbe
-s ours am: 32b2155c7c
-s ours am: 3aba3d9278
-s ours am: e65f480599
-s ours am: 82a19d2fa6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: I46f05e66607c532dcf72b7fb07be6fad45198552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:37:59 +00:00
Bill Yi
82a19d2fa6
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: c25270ff98
-s ours am: ec5f7e0cbe
-s ours am: 32b2155c7c
-s ours am: 3aba3d9278
-s ours am: e65f480599
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: I640bcb75e4fb83bed4abb27563f65e3b38279691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 23:15:21 +00:00
Bill Yi
e65f480599
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: c25270ff98
-s ours am: ec5f7e0cbe
-s ours am: 32b2155c7c
-s ours am: 3aba3d9278
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: Ia855c4f3fc68a0012062ff298d344e875483b795
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 22:52:07 +00:00
Bill Yi
3aba3d9278
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: c25270ff98
-s ours am: ec5f7e0cbe
-s ours am: 32b2155c7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: Ibb5df104f6dc4517b8357eca27e4f74a24e50d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:43:36 +00:00
Bill Yi
32b2155c7c
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: c25270ff98
-s ours am: ec5f7e0cbe
-s ours
...
am skip reason: Merged-In I5d7137dd8d376a306cecfa99246c9edb215672de with SHA-1 4a7a0ba03b
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: I4d1d3351610f15d57cbbfb682f71e989d46e7178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-05 00:00:54 +00:00
Bill Yi
ec5f7e0cbe
[automerger skipped] Merge TQ2A.230505.002 to aosp-master - DO NOT MERGE am: c25270ff98
-s ours
...
am skip reason: Merged-In I5d7137dd8d376a306cecfa99246c9edb215672de with SHA-1 4a7a0ba03b
is already in history
Original change: https://android-review.googlesource.com/c/device/google/pantah/+/2576875
Change-Id: I687274860fdffbd0f298801fe0737ae55db9963e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:21:04 +00:00
Nathan Kulczak
144d52655f
[automerger skipped] [DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: cc25c20403
am: 0953bd2d2a
am: 347f40944d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I6cd9e2b3e7600d5422bc6c24f736cec3a5c874e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:17:58 +00:00
Nathan Kulczak
d5503a1b3c
[automerger skipped] [DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: 81a0734190
am: 52d760eb52
am: 57bffef935
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I462c230a708240cad1b5de46befdca8b9db97c38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:17:14 +00:00
Nathan Kulczak
0df2483a19
[automerger skipped] [DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: cc25c20403
am: 0375a99b86
am: 15e5b73340
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I72a562921bb0267d2c4db49bcfaaa00f100cc092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 23:16:17 +00:00
Nathan Kulczak
347f40944d
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: cc25c20403
am: 0953bd2d2a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: Ie4445fbd6448d2e55ef392188e83a5880c86a3df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:34:21 +00:00
Nathan Kulczak
57bffef935
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: 81a0734190
am: 52d760eb52
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I3fe366762d087a88d0275a7bd85cb4ac67d79e56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:32:00 +00:00
Nathan Kulczak
15e5b73340
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: cc25c20403
am: 0375a99b86
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I54c7a3cf043d1c20a6f2005d85ad5c89988dd96b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 22:31:22 +00:00
Nathan Kulczak
52d760eb52
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: 81a0734190
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: Ia2cd260488bdb5941cc34a72ccae17d19e3b258f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:47:14 +00:00
Nathan Kulczak
0953bd2d2a
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: cc25c20403
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I8e014ab4ef5327bba31ed432272103a99ed307ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:47:09 +00:00
Nathan Kulczak
1696211fa9
[automerger skipped] [DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: c0b6533805
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: Ie7ec9dbb124bce87f9114d353059c16c960a44c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:45:10 +00:00
Nathan Kulczak
0375a99b86
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
am: cc25c20403
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: Ieccbc0bdbbc70207d8d7dd66ba42aa8cd5c1d046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:44:59 +00:00
Nathan Kulczak
c0b6533805
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I1ad7e84df0b740dba64b520ec55b174b6d967a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:07:06 +00:00
Nathan Kulczak
cc25c20403
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I76026c1eaf7fcdefabf02804ba1e738f739b9854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:07:02 +00:00
Nathan Kulczak
81a0734190
[DO NOT MERGE] vibrator: Disable PWLE capability for U am: 0302209e61
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/22911813
Change-Id: I5f334f5983e96816fcdf093f40d195f101c70512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 21:02:36 +00:00
Nathan Kulczak
0302209e61
[DO NOT MERGE] vibrator: Disable PWLE capability for U
...
Set chirp.enabled=0 so that CAP_FREQUENCY_CONTROL and
CAP_COMPOSE_PWLE_EFFECTS will not be enabled.
Bug: 275032416
Test: adb shell idlcli vibrator getCapabilities
Change-Id: I7371f896126fdc876c43d60718baffba59aa32a1
Signed-off-by: Nathan Kulczak <nathankulczak@google.com>
2023-05-04 20:26:44 +00:00
sashwinbalaji
bff7f133c1
thermal: Update config for stats am: 16c067a53e
am: 55532f27d2
am: 96c93e8252
am: e4e1a018d4
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I6f306e92f79ce42374fe6c3a09fc324a499fd591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 12:22:58 +00:00
sashwinbalaji
d31784bb31
thermal: Update config for stats am: 16c067a53e
am: 088172f34a
am: 0d9bc85178
am: c435b54594
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I165b894c28a7b2071041105a182aef44d1f2f481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 12:21:30 +00:00
sashwinbalaji
4c4317118f
thermal: Update config for stats am: 16c067a53e
am: 55532f27d2
am: 6b0c92535f
am: dca5dd7911
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: Ia07e26fafdc107c868d97001326f85055e362872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 12:19:40 +00:00
sashwinbalaji
e4e1a018d4
thermal: Update config for stats am: 16c067a53e
am: 55532f27d2
am: 96c93e8252
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I4174cd38b123532835db1a4d761e1110224fa1aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:37:47 +00:00
sashwinbalaji
c435b54594
thermal: Update config for stats am: 16c067a53e
am: 088172f34a
am: 0d9bc85178
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: Ie6a1788077c32b6ff16e409402d82d4b7677c7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:34:13 +00:00
sashwinbalaji
dca5dd7911
thermal: Update config for stats am: 16c067a53e
am: 55532f27d2
am: 6b0c92535f
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I478c7f5f311d7561c99971beafa172c994ca5600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 11:32:49 +00:00
sashwinbalaji
0d9bc85178
thermal: Update config for stats am: 16c067a53e
am: 088172f34a
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I013bddc5bf169ddaf0cd2234025ab43e5a07c407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:52:14 +00:00
sashwinbalaji
96c93e8252
thermal: Update config for stats am: 16c067a53e
am: 55532f27d2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I34ec8fa5e02f21ed5fdd5749da3b0211e46a7171
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:51:57 +00:00
sashwinbalaji
6b0c92535f
thermal: Update config for stats am: 16c067a53e
am: 55532f27d2
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I6fcb5c62581de38c1b6cbe428028aa21c91dc24d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:49:47 +00:00
sashwinbalaji
0b290e1971
thermal: Update config for stats am: 16c067a53e
am: b3f4df839e
...
Original change: https://googleplex-android-review.googlesource.com/c/device/google/pantah/+/21806783
Change-Id: I8f93c5166fcbbcb40632471314137c65a7ba70be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-04 10:49:41 +00:00