Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11252 commits 1 branch 0 tags 494 MiB
Commit graph

11252 commits

This branch
This branch
All branches
Author SHA1 Message Date
Renato Grottesi
86e6a4bcc3 Revert^2 "Remove settings for old ArmNN HIDL backend" 
6ed8fba5c7

Compile ArmNN shim over the support library.

Remove settings for the old HIDL backend.
The new ones will be in the gs-common folder.

Test: Local run of CtsNNAPITestCases
Test: Local run of VtsHalNeuralnetworksTargetTest
Test: Local run of MLTS Benchmark
Bug: 283724775
Change-Id: I51b44b4e11444661cf965265113a22522568b9b1
 2023-07-13 15:37:35 +00:00
qinyiyan
c3cf2de047 [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 -s ours am: 5a3eb26050 -s ours am: c43d9d8074 -s ours am: 6a7c3cd62e -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 eca2cf5b90 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: I77a60550feb9668a4ebc2d98807cda411c069dd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 12:13:15 +00:00
Renato Grottesi
c359685402 Revert^2 "Remove settings for old ArmNN HIDL backend" 
ba43d8a084

Compile ArmNN shim over the support library.

Remove SELinux permissions and settings for the old HIDL backend.
The new ones will be in the gs-common folder.

Test: Local run of CtsNNAPITestCases
Test: Local run of VtsHalNeuralnetworksTargetTest
Test: Local run of MLTS Benchmark
Bug: 283724775
Change-Id: Ib72308547f08bc21a5a205ec158e297cb8fe9083
 2023-07-13 09:06:17 +00:00
qinyiyan
c6ff05e235 [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 am: 234ae8343d -s ours am: bdb1aea969 -s ours am: 6263625136 -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 e5e62a21a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: I1f2c7296a239d4eec96839aaa3e555fc4742fd54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 08:26:39 +00:00
qinyiyan
bfe91af697 [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 -s ours am: 5a3eb26050 -s ours am: 9d123185f1 -s ours am: 26857f4cfe -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 eca2cf5b90 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: I0551ce94bb3045242b96356e3987587c395d9b01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 08:26:21 +00:00
qinyiyan
6a7c3cd62e [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 -s ours am: 5a3eb26050 -s ours am: c43d9d8074 -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 eca2cf5b90 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: Ia723018dc0d55fc81584f03f9c58b3c9997ea3da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:36:08 +00:00
qinyiyan
6263625136 [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 am: 234ae8343d -s ours am: bdb1aea969 -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 e5e62a21a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: If7e7838e9997ffaf0837c832b294905e065801d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:33:39 +00:00
qinyiyan
26857f4cfe [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 -s ours am: 5a3eb26050 -s ours am: 9d123185f1 -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 eca2cf5b90 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: Ic6221b1628f0994693eb22f08dfb98af11b6b87c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:33:09 +00:00
qinyiyan
8d7d8e997b [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 am: 9679d5fe6d -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 eca2cf5b90 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: I6f62e19b61916ec0b612038e1494c651e88a8eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:48:10 +00:00
qinyiyan
c43d9d8074 [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 -s ours am: 5a3eb26050 -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 eca2cf5b90 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: I34f7db7fcb2e7b65cb7074ee430568780275065f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:47:59 +00:00
qinyiyan
bdb1aea969 [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 am: 234ae8343d -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 e5e62a21a0 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: I73be129de00a4c0dbd76144b598674fbd536f995
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:47:58 +00:00
qinyiyan
9d123185f1 [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 -s ours am: 5a3eb26050 -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 eca2cf5b90 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: I5228d82d4ebff00abf22ad409bee8d32b5af776d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:45:27 +00:00
Steven Moreland
2813f56c88 device FCM -= android.* 
Bug: 290408770
Test: N/A
Change-Id: Ic318a51f8e15832ffcc1539410b5e7c682eb7839
 2023-07-12 23:07:35 +00:00
qinyiyan
234ae8343d Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: I9bde6ac62c414c3032e6f0ae79aef2dda4a80323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:03:42 +00:00
qinyiyan
9679d5fe6d Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: I1c079b16dfd26215bf7f4dd4101a13f96578d2dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:03:16 +00:00
qinyiyan
5a3eb26050 [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: e5e62a21a0 -s ours 
am skip reason: Merged-In I770b006b364eb371f4df95f48e2fe5be0c9a9bff with SHA-1 eca2cf5b90 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23924861

Change-Id: I99b352a33c5c6ee6194c0a2ba5bc70fd20035cab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 23:03:02 +00:00
Android Build Coastguard Worker
df320bb9a9 Snap for 10486787 from 10075c78f5 to udc-qpr1-release 
Change-Id: I484833b9f86b032cda325a1c3fc4fcfd3ecb64fa
 2023-07-12 23:02:29 +00:00
qinyiyan
e5e62a21a0 Use version 1 of the DBA service, since version 1 is the only frozen 
version.
bug:289317242

Change-Id: I770b006b364eb371f4df95f48e2fe5be0c9a9bff
Merged-In: I770b006b364eb371f4df95f48e2fe5be0c9a9bff
 2023-07-12 22:16:59 +00:00
Android Culprit Assistant
ba43d8a084 Revert "Remove settings for old ArmNN HIDL backend" 
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/123b2665-83ef-4fd0-904d-a0d8c5782db9).

Change-Id: Ia25d50cb9e645e77283edb3540be18781ff58f05
 2023-07-12 20:43:54 +00:00
Android Culprit Assistant
6ed8fba5c7 Revert "Remove settings for old ArmNN HIDL backend" 
This revert was created by Android Culprit Assistant. The culprit was identified in the following culprit search session (http://go/aca-get/123b2665-83ef-4fd0-904d-a0d8c5782db9).

Change-Id: I5a477d560dd850a99d2837ebbb44a4305dde58c4
 2023-07-12 20:43:52 +00:00
Renato Grottesi
d97e70b339 Remove settings for old ArmNN HIDL backend 
Compile ArmNN shim over the support library.

Remove settings for the old HIDL backend.
The new ones will be in the gs-common folder.

Test: Local run of CtsNNAPITestCases
Test: Local run of VtsHalNeuralnetworksTargetTest
Test: Local run of MLTS Benchmark
Bug: 283724775
Change-Id: I009f72cee5961769159e68ea2e670e64932c3f13
 2023-07-12 13:11:04 +00:00
Jinyoung Jeong
801af7e713 [GS101][eSIM] Add system properties rule 
Bug: 279988311
Test: https://fusion2.corp.google.com/d517f34a-3242-40b1-adf6-acb6035ff2cb , b/282901698
Change-Id: I6caed744d2bba7882f80f8ace229f6c4b4133c65
Merged-In: I6caed744d2bba7882f80f8ace229f6c4b4133c65
 2023-07-12 07:14:26 +00:00
qinyiyan
3dddbe8994 Use version 1 of the DBA service, since version 1 is the only frozen am: eca2cf5b90 am: 10075c78f5 am: 2323786c0d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23925983

Change-Id: I26a83894264c45b3957be96c010c1c0848a20ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 00:49:53 +00:00
qinyiyan
7f1e238b87 Use version 1 of the DBA service, since version 1 is the only frozen am: eca2cf5b90 am: 9eadf8fa22 am: 7ed92f8ea5 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23925983

Change-Id: I8ac70a75c1456b016a28b4279db461731d5f22d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 00:49:07 +00:00
qinyiyan
2323786c0d Use version 1 of the DBA service, since version 1 is the only frozen am: eca2cf5b90 am: 10075c78f5 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23925983

Change-Id: Ic10238b2c2d7abc4e8d492951eeee23211dd1eb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 00:10:33 +00:00
qinyiyan
7ed92f8ea5 Use version 1 of the DBA service, since version 1 is the only frozen am: eca2cf5b90 am: 9eadf8fa22 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23925983

Change-Id: I3496aebf12705ade993ef1839b92fbe0e7bebf97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-12 00:07:31 +00:00
qinyiyan
10075c78f5 Use version 1 of the DBA service, since version 1 is the only frozen am: eca2cf5b90 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23925983

Change-Id: I8312c6b58378ff659b8f162ca88efc53f8140f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 23:22:23 +00:00
qinyiyan
9eadf8fa22 Use version 1 of the DBA service, since version 1 is the only frozen am: eca2cf5b90 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23925983

Change-Id: Ib95082f303f3d86e8647574d7066c36d5b03eca8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 23:20:30 +00:00
Android Build Coastguard Worker
f2f7e258f7 Snap for 10477539 from ca4d5b08d3 to udc-qpr1-release 
Change-Id: I16be736418d4071435d945be98e97b4212451c9a
 2023-07-11 23:02:16 +00:00
qinyiyan
eca2cf5b90 Use version 1 of the DBA service, since version 1 is the only frozen 
version.
bug:290377605

Change-Id: I770b006b364eb371f4df95f48e2fe5be0c9a9bff
 2023-07-11 18:01:04 +00:00
Renato Grottesi
a2a1f80355 Remove settings for old ArmNN HIDL backend 
Compile ArmNN shim over the support library.

Remove SELinux permissions and settings for the old HIDL backend.
The new ones will be in the gs-common folder.

Test: Local run of CtsNNAPITestCases
Test: Local run of VtsHalNeuralnetworksTargetTest
Test: Local run of MLTS Benchmark
Bug: 283724775
Change-Id: Ic77de74f1723f314dbfaa0cf948351cefd460b76
 2023-07-11 10:59:54 +00:00
Wilson Sung
54da16c0b2 Revert "Update SELinux error" am: 31e0460cba am: 1a71a9f40c am: 18ff46a71b am: dca7a77678 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: I90aec5b1e9de280dfe24bc2931cf5c5ded6d0989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:23:20 +00:00
Wilson Sung
08621dd8c2 Revert "Update SELinux error" am: 31e0460cba am: 25038e3f3f am: fca9db22ba am: affcbd1a34 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: I47447b10fffa5046721e1c84c7e62e7d14e5bd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:23:08 +00:00
Wilson Sung
ed1119cd42 Revert "Update SELinux error" am: 31e0460cba am: 1a71a9f40c am: 4848fa935f am: 4b13de9be1 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: I5384851acd5e0d23c998b3e31b927d5142863e88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 05:22:43 +00:00
Wilson Sung
dca7a77678 Revert "Update SELinux error" am: 31e0460cba am: 1a71a9f40c am: 18ff46a71b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: I6dbb1cfd0b8193afb1fbac90048950689485de26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 04:45:43 +00:00
Wilson Sung
affcbd1a34 Revert "Update SELinux error" am: 31e0460cba am: 25038e3f3f am: fca9db22ba 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: Ic017c18cb4275f609db0c48ac25beb8dcfd4636b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 04:39:32 +00:00
Wilson Sung
4b13de9be1 Revert "Update SELinux error" am: 31e0460cba am: 1a71a9f40c am: 4848fa935f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: I17947c0d10429598777fab88b2714ed069679cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 04:39:23 +00:00
Wilson Sung
b96b36f7ce Revert "Update SELinux error" am: 31e0460cba am: a63a199ff6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: I7be80b9df4c7a40f729812c2e9faf87e439c716d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 03:42:30 +00:00
Wilson Sung
fca9db22ba Revert "Update SELinux error" am: 31e0460cba am: 25038e3f3f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: I7dd0ec97bc60be153878487f41b227d03928baf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 03:41:52 +00:00
Wilson Sung
18ff46a71b Revert "Update SELinux error" am: 31e0460cba am: 1a71a9f40c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: I4f521cc677d9ed3d722a585d72de2ee05247584f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 03:41:30 +00:00
Wilson Sung
4848fa935f Revert "Update SELinux error" am: 31e0460cba am: 1a71a9f40c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: I6bdede516236ec89e6ee53b44de9a9ef3b422fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 03:37:02 +00:00
TeYuan Wang
92b5e927ff Cancel boost on off-mode charger am: ca4d5b08d3 am: 0bec69edc2 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23834972

Change-Id: I91fa1c9efea2e4b7db42a693457e5405fbc4d962
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 03:16:11 +00:00
Wilson Sung
a63a199ff6 Revert "Update SELinux error" am: 31e0460cba 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: I8a012af2baadbe6ab97f589580efa02650ad5054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 02:59:22 +00:00
Wilson Sung
1a71a9f40c Revert "Update SELinux error" am: 31e0460cba 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: Ia246bb019f0f7ebc4a0b7f14e993313480f48991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 02:59:22 +00:00
Wilson Sung
25038e3f3f Revert "Update SELinux error" am: 31e0460cba 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101-sepolicy/+/23875101

Change-Id: If6966226f97b32bc0295cde0d812da5a38f9006f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 02:54:52 +00:00
TeYuan Wang
0bec69edc2 Cancel boost on off-mode charger am: ca4d5b08d3 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23834972

Change-Id: I4aed54860699de898529ae29fda0efd509f92c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-11 02:40:24 +00:00
TeYuan Wang
ca4d5b08d3 Cancel boost on off-mode charger 
Test: Build
Bug: 289120007
Change-Id: Ie7bb050b98efa64eb63ad7a5c29fed7288448128
Signed-off-by: TeYuan Wang <kamewang@google.com>
 2023-07-11 02:02:50 +00:00
Android Build Coastguard Worker
f053910d3d Snap for 10468395 from 5b4a21f0bc to udc-qpr1-release 
Change-Id: I6360b1c91dc8212235824e3dc9167057b7bd4132
 2023-07-10 23:07:13 +00:00
Hsiu-Chang Chen
946c64e935 wifi: convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable am: 5b4a21f0bc am: 4140181003 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23822924

Change-Id: Id416dda5ea75cf39578534c45abc695419e9a97b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 10:21:09 +00:00
Hsiu-Chang Chen
4140181003 wifi: convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable am: 5b4a21f0bc 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/23822924

Change-Id: Ia6d69c652b2393fafe4296145210125fab0a1042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 09:45:22 +00:00