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

6206 commits

This branch
This branch
All branches
Author SHA1 Message Date
Rick Yiu
bf6ba67e93 Disable limiting camera_hal for LAUNCH hint 
If auto rotation is enabled, it will trigger LAUNCH hint while
camera is running if device rotates, which could limit camera_hal
tasks to little cores. So, disable it first until there is a new
hint for the rotation event.

Bug: 297273578
Test: build pass
Change-Id: I276d3c11e95cfaccaadfe45d58131a34a6bdfb54
 2023-09-19 03:03:18 +00:00
André Draszik
e3f5d8ab1c powerhint: provide android-mainline versions for Oriole & Raven 
The android-mainline kernel doesn't provide the scheduler vendor hooks,
and therefore the pixel drivers don't expose anything below
/proc/vendor_sched/. This causes powerpower-libperfmgr to emit *a lot*
of warnings to logcat regarding failures to write to nodes below
/proc/vendor_sched/.

As a solution, provide a -mainline version of powerhint.json for the
two platforms supported by android-mainline.
The new files are based on revision f56bbd1bfb ("disable vendor idle
balancer") of powerhint.json and have all nodes and actions referring
to /proc/vendor_sched/ removed using the following jq commands:
    for f in powerhint-oriole.json powerhint-raven.json ; do \
        fdst="$(basename "${f}" .json)-mainline.json"
        names=$(jq '."Nodes"[] | select(."Path" | startswith("/proc/vendor_sched/")).Name' "${f}" \
                | tr '\n' ' ' \
                | sed -e 's|" "|", "|g')
        jq '. | del( ."Actions"[] | select(."Node"==('"${names}"')))' "${f}" > "${fdst}"
        jq '. | del( ."Nodes"[] | select(."Path" | startswith("/proc/vendor_sched/")) )' "${fdst}" > "${fdst}2"
        mv "${fdst}2" "${fdst}"
    done

The -mainline version will be picked based on a boot property set by
the mainline kernel.

Bug: 265961701
Test: adb shell -nT getprop vendor.powerhal.config
      adb logcat -b all -D 'libperfmgr:V powerhal-libperfmgr:V *:S'
      m libperfmgr_test \
      && adb push \
             out/target/product/oriole/data/nativetest64/libperfmgr_test/libperfmgr_test \
             /data/libperfmgr_test \
      && adb shell /data/libperfmgr_test
Change-Id: Ice07444e38194e5fcf2127e935afdd4d29ff8e87
Signed-off-by: André Draszik <draszik@google.com>
 2023-09-13 17:04:16 +00:00
André Draszik
83eaed4b9e powerhint: fix json syntax 
JSON syntax stipulates no final comma after the last element in an
object. While Android's parser is not that strict, other tools like
'jq' are unhappy about incorrect syntax.

Fix this up, so that we can use 'jq' to generate the android-mainline
versions of these files in the next step.

Bug: 265961701
Test: jq '."Nodes"[]' powerhint-oriole.json powerhint-raven.json
Fixes: f56bbd1bfb ("disable vendor idle balancer")
Change-Id: If57e37d63d3a5bdd93552536691a192850198c0b
Signed-off-by: André Draszik <draszik@google.com>
 2023-09-13 17:04:16 +00:00
Android Build Coastguard Worker
8ad06b48c8 Snap for 10791906 from 1ded370aaf to udc-qpr1-release 
Change-Id: I16802fff59e3b32130c4c0fce54c90dd3413cdad
 2023-09-11 23:02:37 +00:00
Ankur Bakshi
d6fcb1fa60 Update raven SVN to 70 am: 4049cdb9a3 am: ec689a2eb3 am: 1ded370aaf am: 9a87e13201 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: Ibfefcd7c36d620b950ed39997a733cd05853bf7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:19:27 +00:00
Ankur Bakshi
bb8497e27d Update raven SVN to 69 am: ff982eb8d2 am: 6b9c92026a am: 4330f03247 am: 96aef3c284 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: I5bad7eedac3da69ca16bdc1e2e89a2b414d05cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:19:25 +00:00
Automerger Merge Worker
7e617436d5 Merge "Update raven SVN to 70 am: 4049cdb9a3 am: 5544a54921 am: d526fdd1e2" into udc-qpr-dev-plus-aosp am: 1d83edc2f6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: Id2727b71db1944538d6c46fe6850bdb6a20546ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:18:36 +00:00
Automerger Merge Worker
0623467c59 Merge "Update raven SVN to 69 am: ff982eb8d2 am: 1e63c12c5b am: a188c6efd1" into udc-qpr-dev-plus-aosp am: d1caed76a1 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: I5185dc23a09a71bbc850302df22358563d6a4d8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:17:50 +00:00
Ankur Bakshi
ad6cd748c7 Update oriole SVN to 70 am: 47b81f6904 am: d7bae31e13 am: 0c3b47d1b0 am: 525f60725b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I092d8f0bf80bac1471b21839dd5824f690aac297
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:16:56 +00:00
Ankur Bakshi
1a2c0dc5cd Update oriole SVN to 70 am: 47b81f6904 am: cb5c18e22f am: 6b593ce597 am: f8ed0c85c6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I141045b563956301fa20fed42f3959a53e492b70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:16:31 +00:00
Automerger Merge Worker
0c3bec873d Merge "Update oriole SVN to 69 am: 8913112d57 am: e26b268bae" into udc-d1-dev-plus-aosp am: 97300e03d2 am: cbf8cffa92 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: Ib55f9fa2c4cecb97cc10511444c2b07e1c0b1121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:16:06 +00:00
Ankur Bakshi
f698bcbbca Update raven SVN to 70 am: 4049cdb9a3 am: ec689a2eb3 am: fc094b3fa1 am: 48a356db50 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: I6342ddefd6f0e42ecf006578be70d5f9080f9845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:13:53 +00:00
Ankur Bakshi
31a3c59fe0 Update raven SVN to 69 am: ff982eb8d2 am: 6b9c92026a am: 8d6eb707b8 am: 90818fdde3 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: I7e1f6b445333d81d2cd1d5e82845682af7e5c1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:13:50 +00:00
Ankur Bakshi
e9a26c1dbd Update oriole SVN to 70 am: 47b81f6904 am: d7bae31e13 am: d7ee9a4b24 am: 15a2b5003e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I06ea1ac78a841acda1d29d271329c67e6fd3fa61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:10:01 +00:00
Ankur Bakshi
a189f7624a Update oriole SVN to 69 am: 8913112d57 am: 4adfcceaf0 am: afd7686cf3 am: f2e6333dff 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: I42bebfb5aaa1173bcf6f5a54eee743ab33317061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 21:36:43 +00:00
Ankur Bakshi
16354e1933 Update oriole SVN to 69 am: 8913112d57 am: 4adfcceaf0 am: 91df7f2062 am: 7355758fe2 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: I3d4497a9745fa43eb9d14aa05e1767f51ed5cdb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 21:31:44 +00:00
Ankur Bakshi
9a87e13201 Update raven SVN to 70 am: 4049cdb9a3 am: ec689a2eb3 am: 1ded370aaf 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: I21a8c95c27e5a72107e6f9d6c9be03179773452f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:37:14 +00:00
Ankur Bakshi
96aef3c284 Update raven SVN to 69 am: ff982eb8d2 am: 6b9c92026a am: 4330f03247 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: Ia2fba54cd30506d7bdad06a1eb7ccc94511c5751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:37:12 +00:00
Automerger Merge Worker
1d83edc2f6 Merge "Update raven SVN to 70 am: 4049cdb9a3 am: 5544a54921 am: d526fdd1e2" into udc-qpr-dev-plus-aosp 2023-09-11 20:35:41 +00:00
Automerger Merge Worker
d1caed76a1 Merge "Update raven SVN to 69 am: ff982eb8d2 am: 1e63c12c5b am: a188c6efd1" into udc-qpr-dev-plus-aosp 2023-09-11 20:35:41 +00:00
Ankur Bakshi
3e8795197b Update raven SVN to 70 am: 4049cdb9a3 am: 5544a54921 am: d526fdd1e2 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: Id5d6d135e94f1368df0d14d8f67292c3f3ab3eca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:35:36 +00:00
Ankur Bakshi
e1ddfe3fed Update raven SVN to 69 am: ff982eb8d2 am: 1e63c12c5b am: a188c6efd1 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: I3ba9a6cc5fb8e4e6ac4d378e56799548ec84d294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:35:34 +00:00
Ankur Bakshi
525f60725b Update oriole SVN to 70 am: 47b81f6904 am: d7bae31e13 am: 0c3b47d1b0 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I97ddbd9c331951a0f09620015a568a7df0ea4d24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:35:33 +00:00
Ankur Bakshi
f8ed0c85c6 Update oriole SVN to 70 am: 47b81f6904 am: cb5c18e22f am: 6b593ce597 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I6043a7b4412947d9f0d87b9655d30f46b7aeb5d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:34:45 +00:00
Automerger Merge Worker
cbf8cffa92 Merge "Update oriole SVN to 69 am: 8913112d57 am: e26b268bae" into udc-d1-dev-plus-aosp am: 97300e03d2 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: Ib94c7ba8e8201d8f6ac3a8f671918692c0ead835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:34:14 +00:00
Ankur Bakshi
48a356db50 Update raven SVN to 70 am: 4049cdb9a3 am: ec689a2eb3 am: fc094b3fa1 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: I93b769028a45387e2c6c6cd01d0a252f2eac2b3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:34:03 +00:00
Ankur Bakshi
90818fdde3 Update raven SVN to 69 am: ff982eb8d2 am: 6b9c92026a am: 8d6eb707b8 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: I0c726c1feff0fb623347dc1c736952823b442cdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:34:01 +00:00
Ankur Bakshi
15a2b5003e Update oriole SVN to 70 am: 47b81f6904 am: d7bae31e13 am: d7ee9a4b24 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I9032a8fdd7b7e03bb16b3911914fca9aed1858fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:33:03 +00:00
Ankur Bakshi
f2e6333dff Update oriole SVN to 69 am: 8913112d57 am: 4adfcceaf0 am: afd7686cf3 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: I2197eee96c786e0c91ba6c00433755d169eb378f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:32:52 +00:00
Ankur Bakshi
7355758fe2 Update oriole SVN to 69 am: 8913112d57 am: 4adfcceaf0 am: 91df7f2062 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: I0df2e26567bf1cc60857b78f606bbf482470ff06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 20:32:19 +00:00
Ankur Bakshi
d763f6a7a7 Update raven SVN to 70 am: 4049cdb9a3 am: c391b756a7 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: I1bc1e0babcd411504935ccd15452fd9af9c2c8ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:59:27 +00:00
Ankur Bakshi
c34f175764 Update raven SVN to 69 am: ff982eb8d2 am: b7b675e7e5 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: Ib12646453966a9a0619431466c09d2ca51d3159d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:59:24 +00:00
Ankur Bakshi
9486bda430 Update oriole SVN to 70 am: 47b81f6904 am: ec507add0f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I09ef62ca6dcf05e4092fe319fa95554fd8658e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:59:10 +00:00
Ankur Bakshi
d526fdd1e2 Update raven SVN to 70 am: 4049cdb9a3 am: 5544a54921 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: I7c86b6aa9c76ec871ec894e96d1465da03246210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:54:07 +00:00
Ankur Bakshi
a188c6efd1 Update raven SVN to 69 am: ff982eb8d2 am: 1e63c12c5b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: I388c640513fc5576318a6e51be8fc30cbb9558ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:54:04 +00:00
Ankur Bakshi
20bba3eae4 Update oriole SVN to 69 am: 8913112d57 am: 66302cca11 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: Ie31c8f5325fcc6f5c3bad3ded3bfdc6a9c3e0b4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:53:29 +00:00
Ankur Bakshi
1ded370aaf Update raven SVN to 70 am: 4049cdb9a3 am: ec689a2eb3 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: If63389150447478b816f955e2365363810a4d5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:51:22 +00:00
Ankur Bakshi
4330f03247 Update raven SVN to 69 am: ff982eb8d2 am: 6b9c92026a 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: I94eef315ef32a8022e28cfaa6aed0a3a5cfc62cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:51:20 +00:00
Ankur Bakshi
6b593ce597 Update oriole SVN to 70 am: 47b81f6904 am: cb5c18e22f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I11a1061e6e616967b5c8f2293762acfe81fad863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:51:03 +00:00
Ankur Bakshi
0c3b47d1b0 Update oriole SVN to 70 am: 47b81f6904 am: d7bae31e13 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I1499df75393d3bb6931f8c54d822b56908f2c844
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:50:51 +00:00
Automerger Merge Worker
97300e03d2 Merge "Update oriole SVN to 69 am: 8913112d57 am: e26b268bae" into udc-d1-dev-plus-aosp 2023-09-11 19:48:55 +00:00
Ankur Bakshi
c3c0469281 Update oriole SVN to 69 am: 8913112d57 am: e26b268bae 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: I9f551efc8fc64c425689c0d8865ed532a849a601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:48:49 +00:00
Ankur Bakshi
fc094b3fa1 Update raven SVN to 70 am: 4049cdb9a3 am: ec689a2eb3 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: I8d3a03f215fd8d4b86a31cd7925a52f0e0878559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:48:42 +00:00
Ankur Bakshi
91df7f2062 Update oriole SVN to 69 am: 8913112d57 am: 4adfcceaf0 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: I0f94a0eb3774891a4b911d7d8ab2a3fe7880c720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:48:40 +00:00
Ankur Bakshi
8d6eb707b8 Update raven SVN to 69 am: ff982eb8d2 am: 6b9c92026a 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: I22eea568774b0b9d13f2805f635cc44560c5ca28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:48:39 +00:00
Ankur Bakshi
d7ee9a4b24 Update oriole SVN to 70 am: 47b81f6904 am: d7bae31e13 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I94af31f769d856be05e3ffe1fd0eeeac0adbf6d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:48:12 +00:00
Ankur Bakshi
afd7686cf3 Update oriole SVN to 69 am: 8913112d57 am: 4adfcceaf0 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24682777

Change-Id: I16b19a6f8f554050a1a691fd422492031f97b8af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 19:46:18 +00:00
Ankur Bakshi
ec689a2eb3 Update raven SVN to 70 am: 4049cdb9a3 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24697989

Change-Id: I91d7aa45f977fcd44ac8609b753a83d40b14ad17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 18:56:06 +00:00
Ankur Bakshi
6b9c92026a Update raven SVN to 69 am: ff982eb8d2 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24683884

Change-Id: Iee910d292bfc1275775fe28eabea0e499fa0eb12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 18:56:03 +00:00
Ankur Bakshi
d7bae31e13 Update oriole SVN to 70 am: 47b81f6904 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/24695743

Change-Id: I384d2cc6ed408d3c8bdbe946fa060cfaad787380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 18:55:36 +00:00