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

4194 commits

This branch
This branch
All branches
Author SHA1 Message Date
Renato Grottesi
c75dc9bc7e [automerger skipped] Remove settings for old ArmNN HIDL backend am: c0baa17abe am: 21b8bf65c1 am: da19cc70eb -s ours 
am skip reason: Merged-In Ic9f1c26345e52df8b6ef75e2a8261d71a8950c72 with SHA-1 86e42129ab is already in history

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

Change-Id: Id2d22c88d348d2a653b7831615ca94565af080ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 13:11:01 +00:00
Renato Grottesi
da19cc70eb Remove settings for old ArmNN HIDL backend am: c0baa17abe am: 21b8bf65c1 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24142831

Change-Id: I3a0900d6c34aa034a130f21c5098888b5a061933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-27 12:53:02 +00:00
Robin Peng
b519053b3d do not mount the debugfs on userdebug builds am: 5f0318b21f am: a3b5f187a7 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24186484

Change-Id: I03dc9ac41ed4b7cc37dc952ce84eaae2c11aaf48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 02:06:50 +00:00
Robin Peng
a3b5f187a7 do not mount the debugfs on userdebug builds am: 5f0318b21f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24186484

Change-Id: I7887bfd4458f6efd6afc4f41072d4e554d18b3cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-26 01:18:48 +00:00
Ankit Goyal
0606f21e3e Fix swiftshader libs and properties 
Bug: 268269980
Test: Boots to home with SW and SELinux disabled
Change-Id: Ib833e1f575ce3172e40e8975eefe57a4c23414c4
 2023-07-26 01:00:31 +00:00
Robin Peng
5f0318b21f do not mount the debugfs on userdebug builds 
Bug: 278988913
Change-Id: I5c703310a4f82acf52fad87854682ca6e668d99b
Signed-off-by: Robin Peng <robinpeng@google.com>
 2023-07-26 00:25:54 +00:00
Akilesh Kailash
acdb574bd2 [automerger skipped] Use lz4 compression instead of gz. am: 06b17a25e1 -s ours am: a75283d970 -s ours 
am skip reason: Merged-In I0a6b164432e16f531c0cc1157814411960915539 with SHA-1 62afad0252 is already in history

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

Change-Id: Iceffb733a09f4904cc58bdb5a6f8fd1da7a2a009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 20:42:37 +00:00
Ilya Matyukhin
d2830c3af6 Bump IDebugManager version to 4 am: c011b953ff am: a5ed86d1b5 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/23923866

Change-Id: I87f7e76abaaa59469f7aed1e86cd85399d23d1d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 20:38:27 +00:00
Renato Grottesi
0dd578a5f8 [automerger skipped] Remove settings for old ArmNN HIDL backend am: c0baa17abe am: 0d5fddfe8d am: ef7cf46a3b -s ours 
am skip reason: Merged-In Ic9f1c26345e52df8b6ef75e2a8261d71a8950c72 with SHA-1 86e42129ab is already in history

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

Change-Id: Iaa7e6c6d65d63712e10bef8399c7bad1230d1947
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 20:04:13 +00:00
Akilesh Kailash
a75283d970 [automerger skipped] Use lz4 compression instead of gz. am: 06b17a25e1 -s ours 
am skip reason: Merged-In I0a6b164432e16f531c0cc1157814411960915539 with SHA-1 62afad0252 is already in history

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

Change-Id: I5769421132b188d053d7f31d199c2abd98dc0db9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 19:39:04 +00:00
Ilya Matyukhin
a5ed86d1b5 Bump IDebugManager version to 4 am: c011b953ff 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/23923866

Change-Id: If04d4d84a9b399486b825d17d3a516f4e04474f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-25 19:37:12 +00:00
Renato Grottesi
21b8bf65c1 Remove settings for old ArmNN HIDL backend am: c0baa17abe 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24059470

Change-Id: Ia9badcf5bf65412a560f668a5fe9ce9fc64ce0b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: Ic9f1c26345e52df8b6ef75e2a8261d71a8950c72
 2023-07-25 15:15:59 +00:00
Renato Grottesi
ef7cf46a3b Remove settings for old ArmNN HIDL backend am: c0baa17abe am: 0d5fddfe8d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24059470

Change-Id: I7236bd445cb9b00d1458a5410c881415fc33eb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: Ic9f1c26345e52df8b6ef75e2a8261d71a8950c72
 2023-07-25 06:38:24 +00:00
Akilesh Kailash
06b17a25e1 Use lz4 compression instead of gz. 
Given the benefits of lz4 with respect
to install and merge times as well
as reduce in CPU usage, it is worth
to switch to lz4

Test: OTA
Bug: 291594891
Signed-off-by: Akilesh Kailash <akailash@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:62afad0252b57c00847d4942504c6435105b8ccb)
Merged-In: I0a6b164432e16f531c0cc1157814411960915539
Change-Id: I0a6b164432e16f531c0cc1157814411960915539
 2023-07-25 03:52:08 +00:00
Priyanka Advani
d2adab192e Revert "Use graphics allocator 2" 
Revert submission 23772493-allocator-aidl2

Reason for revert: Probable culprit for b/292565867, b/292569168

Reverted changes: /q/submissionid:23772493-allocator-aidl2

Change-Id: I265a338737dfd6bc03736cacf545cb426ab0b5e8
 2023-07-24 20:14:45 +00:00
Devika Krishnadas
bcb959448c Use graphics allocator 2 
Bug: 287353739
Test: atest VtsHalGraphicsMapperV4_0TargetTest

Change-Id: I080045d75273fcf01d9129dee85fdf3c7b801117
Signed-off-by: Devika Krishnadas <kdevika@google.com>
 2023-07-21 21:49:24 +00:00
Ilya Matyukhin
c011b953ff Bump IDebugManager version to 4 
Bug: 278914238
Test: build
Change-Id: I82bc2459776961a8a4d921aaecfa081dcbda6a00
 2023-07-20 18:58:38 +00:00
Renato Grottesi
0d5fddfe8d Remove settings for old ArmNN HIDL backend am: c0baa17abe 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24059470

Change-Id: If0ea12a125a6cc44dc157fb66c35884105ca34d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-20 07:28:19 +00:00
Renato Grottesi
c0baa17abe 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 AIDL settings 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
Merged-In: I3652eceb14d06a3e909444edc21ad86d9378bc6c
Change-Id: If26928b13cdd9f3342026af95b9446f2918784fa
 2023-07-20 06:37:06 +00:00
Akilesh Kailash
a86c773ace Use lz4 compression instead of gz. am: 62afad0252 am: 9c1298bc67 am: 8d919c2df1 am: 1f407ff3e1 am: be4a9de647 
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2657912

Change-Id: I4b7dc8aa201b126ecb5a76834caceab2a81b0ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 21:58:02 +00:00
Akilesh Kailash
be4a9de647 Use lz4 compression instead of gz. am: 62afad0252 am: 9c1298bc67 am: 8d919c2df1 am: 1f407ff3e1 
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2657912

Change-Id: Ic66889d79d47c492778a9478810eb300886959c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 19:02:39 +00:00
Akilesh Kailash
1f407ff3e1 Use lz4 compression instead of gz. am: 62afad0252 am: 9c1298bc67 am: 8d919c2df1 
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2657912

Change-Id: I1410548544ccb266e370f8110b6c5fad30a2f835
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 18:21:22 +00:00
Akilesh Kailash
8d919c2df1 Use lz4 compression instead of gz. am: 62afad0252 am: 9c1298bc67 
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2657912

Change-Id: I2932703a9b9db1866a83e2c35057278f565c296e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 17:37:43 +00:00
Akilesh Kailash
9c1298bc67 Use lz4 compression instead of gz. am: 62afad0252 
Original change: https://android-review.googlesource.com/c/device/google/gs201/+/2657912

Change-Id: I1f3dfd5c01118fb4df812f4aab3fd1c89499857e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-17 16:52:19 +00:00
Akilesh Kailash
62afad0252 Use lz4 compression instead of gz. 
Given the benefits of lz4 with respect
to install and merge times as well
as reduce in CPU usage, it is worth
to switch to lz4

Test: OTA
Change-Id: I0a6b164432e16f531c0cc1157814411960915539
Signed-off-by: Akilesh Kailash <akailash@google.com>
 2023-07-16 23:57:47 -07:00
Cody Northrop
627d49b3e7 EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 am: 66f9fff138 am: 49f3b66b3a am: 490b3ba315 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: I7acef0bfef8b4498395ffe5add8ce802581187f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-15 00:32:47 +00:00
Cody Northrop
8c9dd70821 EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 am: 6b3cae000b am: f31eb53f10 am: cd6f3bb8c0 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: I6ea93840e6aa1d967bcb9ebcb283d18d5d339943
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-15 00:31:40 +00:00
Cody Northrop
e0b4788dc8 EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 am: 66f9fff138 am: fcc207a65e am: 2a3057f547 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: I87c597516cbd6a5a314a2e8380e7adce6e60f65c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-15 00:31:08 +00:00
Cody Northrop
490b3ba315 EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 am: 66f9fff138 am: 49f3b66b3a 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: I5817a3140d5e28d1e65d5ddc4434b6d7ee430386
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 23:51:01 +00:00
Cody Northrop
cd6f3bb8c0 EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 am: 6b3cae000b am: f31eb53f10 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: Ia71442ff84489684047ebeffe6428e66bf1ecf22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 23:46:21 +00:00
Cody Northrop
2a3057f547 EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 am: 66f9fff138 am: fcc207a65e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: Icd9668b9224d863d847d0cfff2b386e5e8b0df8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 23:45:32 +00:00
Cody Northrop
49f3b66b3a EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 am: 66f9fff138 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: I4044651f9399423d294548773e40b3fa9f181cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 23:02:52 +00:00
Cody Northrop
73d5346ece EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 am: 440253b7ba 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: If82b5ad9844cb5c3eea26f0541a9954e9110db04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 23:02:49 +00:00
Cody Northrop
f31eb53f10 EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 am: 6b3cae000b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: Ibdca6a6f54b4983eed88395a59640382083c7217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 23:02:36 +00:00
Cody Northrop
fcc207a65e EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 am: 66f9fff138 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: Ia3d58fe7ca1bab7ef7683a89197f86cac9ed0500
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 23:00:52 +00:00
Cody Northrop
440253b7ba EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: I652198b119bf2290a2655793be82320b22d54818
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 22:14:23 +00:00
Cody Northrop
6b3cae000b EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: I310ff796ca4be9444d8cc29f7cc72e673dd97632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 22:14:10 +00:00
Cody Northrop
66f9fff138 EGL: Reduce multifile blobcache limit to 32MB am: 5c4cbe4023 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24044691

Change-Id: I8f8b2b82e2c79ecb541d3a46cb21ec62cbc9e146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 22:14:03 +00:00
Cody Northrop
5c4cbe4023 EGL: Reduce multifile blobcache limit to 32MB 
Loading the larger limit is taking too long in the field for
apps that are filling the cache.

Test: Ran app until it exceeded cache, watched it reset to 50%
Bug: 290249239
Change-Id: I1b80b8ad427d8a0d2a6d967b98b89d808c549527
 2023-07-14 20:52:43 +00:00
Dinesh Yadav
671e69eef0 [Cleanup] Move gxp sepolicies to gs-common for P22 
Due to cleanup /gs-common/gxp/dump.mk has been changed to
/gs-common/gxp/gxp.mk

Bug: 288368306
Change-Id: I2b463a8e696644703b7cedcf73516ffa9459e9f9
Signed-off-by: Dinesh Yadav <dkyadav@google.com>
 2023-07-14 04:00:23 +00:00
samou
7db08754b8 bcl: mask out clock divider for CPUCL1 am: 8990012f1d am: 80bcae7564 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24031607

Change-Id: I230f376afd0b90cab72d6f10dafa97685939b649
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 03:57:48 +00:00
samou
80bcae7564 bcl: mask out clock divider for CPUCL1 am: 8990012f1d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs201/+/24031607

Change-Id: Ia4c6874e6bea008955364684f33d7c9c33963d47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-14 03:19:51 +00:00
samou
8990012f1d bcl: mask out clock divider for CPUCL1 
Bug: 288238917
Change-Id: I330d966ee13539fcb46d54883d04b42152f6a58f
Signed-off-by: samou <samou@google.com>
 2023-07-14 02:37:43 +00:00
Renato Grottesi
86e42129ab Revert^2 "Remove settings for old ArmNN HIDL backend" 
a15331d574

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: Ic9f1c26345e52df8b6ef75e2a8261d71a8950c72
 2023-07-13 15:37:35 +00:00
qinyiyan
aaa1cfe0de [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: 66a548d416 -s ours am: 0845f0ca7a -s ours am: fdf5f05984 -s ours am: 3a4e16f0dd -s ours 
am skip reason: Merged-In Ieec5b8b48c3567c940717df55a2e4582ef47d16c with SHA-1 0964781a6c is already in history

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

Change-Id: I6ecd092afd883745206c0288f34691184b808228
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 12:13:15 +00:00
qinyiyan
c38ea1df66 [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: 66a548d416 am: 26b47e2459 -s ours am: bdb3eddbd5 -s ours am: d151d5e780 -s ours 
am skip reason: Merged-In Ieec5b8b48c3567c940717df55a2e4582ef47d16c with SHA-1 66a548d416 is already in history

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

Change-Id: I6ad8faaba77781484d8a8c31ccadb2a4225469bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 08:26:39 +00:00
qinyiyan
0ec455034c [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: 66a548d416 -s ours am: 0845f0ca7a -s ours am: ecc2f60eea -s ours am: d5c171fbaa -s ours 
am skip reason: Merged-In Ieec5b8b48c3567c940717df55a2e4582ef47d16c with SHA-1 0964781a6c is already in history

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

Change-Id: Ifcb86b318a58c0fe872526852656966d6fc5a577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 08:26:21 +00:00
qinyiyan
3a4e16f0dd [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: 66a548d416 -s ours am: 0845f0ca7a -s ours am: fdf5f05984 -s ours 
am skip reason: Merged-In Ieec5b8b48c3567c940717df55a2e4582ef47d16c with SHA-1 0964781a6c is already in history

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

Change-Id: Id71cfd5d33be699c6e402e0502535001f28e21be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:36:08 +00:00
qinyiyan
d151d5e780 [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: 66a548d416 am: 26b47e2459 -s ours am: bdb3eddbd5 -s ours 
am skip reason: Merged-In Ieec5b8b48c3567c940717df55a2e4582ef47d16c with SHA-1 66a548d416 is already in history

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

Change-Id: Id7b1bc23c78ec161a125cc8f0551a767bb7b7022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-13 00:33:39 +00:00
qinyiyan
d5c171fbaa [automerger skipped] Use version 1 of the DBA service, since version 1 is the only frozen am: 66a548d416 -s ours am: 0845f0ca7a -s ours am: ecc2f60eea -s ours 
am skip reason: Merged-In Ieec5b8b48c3567c940717df55a2e4582ef47d16c with SHA-1 0964781a6c is already in history

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

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