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

4431 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daeho Jeong
1ec55cd83d fstab: disable auto compression for apk,apex and so am: c10d805383 am: 7c4f2ae2ff 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177

Change-Id: I2a3813a275f0ce30640f37a676177e1c86a1d093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 22:08:03 +00:00
Daeho Jeong
7c4f2ae2ff fstab: disable auto compression for apk,apex and so am: c10d805383 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18931177

Change-Id: I500101fd6d1243c5be89778ecf923704276a997b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 21:41:57 +00:00
Daeho Jeong
c10d805383 fstab: disable auto compression for apk,apex and so 
Bug: 235480291
Test: check mount option

Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I3765847b9c2074e1501646675fed7109a7a73230
 2022-06-21 21:14:26 +00:00
Darren Hsu
4bb5e19ad9 [automerger skipped] powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0 am: e2fd9e040f am: 12f3f942b8 -s ours 
am skip reason: Merged-In I40c155c78331255ec5a7d9300798cec0a3d219f5 with SHA-1 7dfafc70a0 is already in history

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

Change-Id: I06c553877d8acb24dceaf1ddc08f17c50f6f6e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:44:55 +00:00
Darren Hsu
a285feb5c9 [automerger skipped] powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0 am: f2ab4a72d9 am: 1ab531d5eb -s ours 
am skip reason: Merged-In I40c155c78331255ec5a7d9300798cec0a3d219f5 with SHA-1 3698b06acc is already in history

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

Change-Id: I1c4dd85e4057106e493824a9646ac165e3bc27d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:44:36 +00:00
Darren Hsu
12f3f942b8 powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0 am: e2fd9e040f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18965112

Change-Id: I5f58f09c8958e53464d67a660e1ebd26f1492deb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:26:59 +00:00
Darren Hsu
1ab531d5eb powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0 am: f2ab4a72d9 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18965112

Change-Id: If50d83b0a421321380a345d48356521d55a93ae2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:26:44 +00:00
Darren Hsu
e2fd9e040f powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18965112

Change-Id: I6c3fd2ed069f002dbc6a691d917b1ad2965c5e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:00:12 +00:00
Darren Hsu
f2ab4a72d9 powerstats: set AoC clock for timestamp calculations am: 7dfafc70a0 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18965112

Change-Id: I2d7c438ad849efa18dcbf22cd6468fd9243b9e68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-21 04:00:12 +00:00
Xin Li
78dba379b6 [automerger skipped] Merge SQ3A.220605.009 am: de7209e8a0 am: 231755345a -s ours am: 9757323e46 -s ours am: 89042ede18 -s ours am: 5405ed6d90 -s ours 
am skip reason: Merged-In I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f with SHA-1 346895302a is already in history

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

Change-Id: Ie64eb0347f01c8aae304ba0d1332999cb5b7e046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 21:18:58 +00:00
Xin Li
5405ed6d90 [automerger skipped] Merge SQ3A.220605.009 am: de7209e8a0 am: 231755345a -s ours am: 9757323e46 -s ours am: 89042ede18 -s ours 
am skip reason: Merged-In I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f with SHA-1 346895302a is already in history

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

Change-Id: I9fe467b02b61f39830b50c81c745990e7d51cd25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 20:59:25 +00:00
Xin Li
89042ede18 [automerger skipped] Merge SQ3A.220605.009 am: de7209e8a0 am: 231755345a -s ours am: 9757323e46 -s ours 
am skip reason: Merged-In I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f with SHA-1 346895302a is already in history

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

Change-Id: I659c70dd6310e5133178c35a34f5929093e44acb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 15:03:13 +00:00
Xin Li
9757323e46 [automerger skipped] Merge SQ3A.220605.009 am: de7209e8a0 am: 231755345a -s ours 
am skip reason: Merged-In I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f with SHA-1 346895302a is already in history

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

Change-Id: I3b5daeefe14722a3b8f9eaba18fd17d0e45b7e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 14:36:30 +00:00
Xin Li
231755345a Merge SQ3A.220605.009 am: de7209e8a0 
Original change: https://android-review.googlesource.com/c/device/google/gs101/+/2130132

Change-Id: I5a6344108b6f407aa85eee434472a5e403baab7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 14:09:47 +00:00
David Chao
f66bf2fe25 gs101: move charger thermalHAL setup into common code am: 88fb3bfe07 am: 1af01d23c2 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18910875

Change-Id: I1eabfde0a5aa734f0bbeb5205f230e2c98e014c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:15:41 +00:00
Pierre-Clément Tosi
615d9fccca Revert^2 "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: d5ce52e137 am: 4c7eb154a8 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18577605

Change-Id: Icdb4641906e3e8f99c25733fb4de730727d3cdaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 08:15:06 +00:00
David Chao
1af01d23c2 gs101: move charger thermalHAL setup into common code am: 88fb3bfe07 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18910875

Change-Id: Ifbb21b248de103997a10c3a2d134354fcf86202f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:43:10 +00:00
Pierre-Clément Tosi
4c7eb154a8 Revert^2 "gs101: Add pvmfw to AB_OTA_PARTITIONS" am: d5ce52e137 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18577605

Change-Id: If3deb09e014a5de4b2f9c54a43e5f0d3f1e1d2b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-20 07:43:00 +00:00
David Chao
88fb3bfe07 gs101: move charger thermalHAL setup into common code 
To aligned with P22 to move charger thermalHAL setup into common code

Bug: 200615564
Test: build pass and boot to home
Change-Id: Idfe47fe64e4c158f27cd587ca8d768e13292c361
 2022-06-20 07:10:50 +00:00
Darren Hsu
3698b06acc powerstats: set AoC clock for timestamp calculations 
Bug: 233923713
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I40c155c78331255ec5a7d9300798cec0a3d219f5
Signed-off-by: Darren Hsu <darrenhsu@google.com>
 2022-06-20 04:57:53 +00:00
Xin Li
f968a86de7 [automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf -s ours am: b6ef0dc62f -s ours am: d9fce352ad -s ours am: e492836007 -s ours am: bad8faec6e -s ours 
am skip reason: Merged-In I42565f0acc744669c6c335543a6f1470ad326d4e with SHA-1 42cc5cd651 is already in history

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

Change-Id: I777ed35cb296de9e4c921d00b444dc594d861745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 21:33:36 +00:00
Xin Li
bad8faec6e [automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf -s ours am: b6ef0dc62f -s ours am: d9fce352ad -s ours am: e492836007 -s ours 
am skip reason: Merged-In I42565f0acc744669c6c335543a6f1470ad326d4e with SHA-1 42cc5cd651 is already in history

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

Change-Id: Ie00170424f5fa7754ab35d46afdcb3b47889fdd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 20:52:43 +00:00
Xin Li
e492836007 [automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf -s ours am: b6ef0dc62f -s ours am: d9fce352ad -s ours 
am skip reason: Merged-In I42565f0acc744669c6c335543a6f1470ad326d4e with SHA-1 42cc5cd651 is already in history

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

Change-Id: Id6208d594032f809f943fdc3d4cc0f97eb90e31b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 19:56:25 +00:00
Lingfeng Yang
cb4dbe6454 Revert "Switch gs101's GLES system driver to ANGLE" 
This reverts commit fdcd0ecb95.

Reason for revert: Bug: 235862124

Change-Id: I779da4bfce22d2f80f70dda4807e6296a04ca5d4
 2022-06-17 18:57:18 +00:00
Darren Hsu
7dfafc70a0 powerstats: set AoC clock for timestamp calculations 
Bug: 233923713
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I40c155c78331255ec5a7d9300798cec0a3d219f5
Merged-In: I40c155c78331255ec5a7d9300798cec0a3d219f5
Signed-off-by: Darren Hsu <darrenhsu@google.com>
 2022-06-17 12:49:04 +00:00
Pierre-Clément Tosi
d5ce52e137 Revert^2 "gs101: Add pvmfw to AB_OTA_PARTITIONS" 
Now that the necessary SELinux policies are in (ag/16507235), we should
be able to re-apply this change without breaking OTA updates
(b/211070100).

This reverts commit efd5649bb8.

Bug: 210833963
Test: local OTA update (see bug)
Change-Id: I0fd5f840159e4163adde753f6d339546067b8cf6
(cherry picked from commit e635619443)
 2022-06-17 08:24:06 +00:00
Xin Li
de7209e8a0 Merge SQ3A.220605.009 
Bug: 236045730
Merged-In: I6ebabb9d53028a05950d7d00c34ffdf33fb8ff2f
Change-Id: I7baa7d362aab400eefab4e1a833a31cd3798d118
 2022-06-16 22:42:57 -07:00
Xin Li
d9fce352ad [automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf -s ours am: b6ef0dc62f -s ours 
am skip reason: Merged-In I42565f0acc744669c6c335543a6f1470ad326d4e with SHA-1 42cc5cd651 is already in history

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

Change-Id: I9b2b1d5a5629caaf75a04416517b123a5c6c54ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-17 00:14:20 +00:00
Ruofei Ma
6b8caa0e04 Revert "update performance-point for media performance class 13" am: 079810e65b am: e1121f430a am: 92c3560f24 am: c323e40a4d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: I5f023d73bc28339f8d74cf007fba66161f41c3d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 22:38:00 +00:00
Ruofei Ma
c685523e9d Revert "update performance-point for media performance class 13" am: 079810e65b am: ab062f9fc3 am: c6c107ca6d am: dbf05f0650 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: I39e2aa25b3a30791dc4c4f3fa27169210b3a1a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 22:37:08 +00:00
Ruofei Ma
0d7aca48a2 Revert "update performance-point for media performance class 13" am: 079810e65b am: ab062f9fc3 am: 21445f3149 am: af56e1caff 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: I29d8e082ba5c23d984b0018eed9b7f9689731ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 22:35:11 +00:00
Xin Li
b6ef0dc62f [automerger skipped] Merge Android 12 QPR 3 am: b03bfa6ccf -s ours 
am skip reason: Merged-In I42565f0acc744669c6c335543a6f1470ad326d4e with SHA-1 42cc5cd651 is already in history

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

Change-Id: If4a9406c9249ce27322f3d9d753ae979c46064e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:57:13 +00:00
Ruofei Ma
c323e40a4d Revert "update performance-point for media performance class 13" am: 079810e65b am: e1121f430a am: 92c3560f24 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: Ie0fe3690c82f52d3fcf8396f4372e7253da3cdef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:37:38 +00:00
Ruofei Ma
dbf05f0650 Revert "update performance-point for media performance class 13" am: 079810e65b am: ab062f9fc3 am: c6c107ca6d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: I3009a1dd10ecb22fdabdf8bc044b76b0f1c5088d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:37:33 +00:00
Ruofei Ma
af56e1caff Revert "update performance-point for media performance class 13" am: 079810e65b am: ab062f9fc3 am: 21445f3149 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: Ieba119e100bad0aa1dc160a7f3ff2e750ea4b1ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 19:37:09 +00:00
Ruofei Ma
92c3560f24 Revert "update performance-point for media performance class 13" am: 079810e65b am: e1121f430a 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: I7ac2fd7621fa9bd1d4d3eb0eb17f7e15e63ea9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 18:15:18 +00:00
Ruofei Ma
c6c107ca6d Revert "update performance-point for media performance class 13" am: 079810e65b am: ab062f9fc3 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: I00290c601a1252731968acda6c0583d78eba26bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 18:15:15 +00:00
Ruofei Ma
21445f3149 Revert "update performance-point for media performance class 13" am: 079810e65b am: ab062f9fc3 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: I0df8e688a7f85209cf967d265eb503ea2c1673f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 18:15:11 +00:00
Ruofei Ma
0fea45335f Revert "update performance-point for media performance class 13" am: 079810e65b am: 5ba37dc273 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: I85bf075111c3e9a1a5dff1a731074505dc1ea3bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 18:14:34 +00:00
Ruofei Ma
ab062f9fc3 Revert "update performance-point for media performance class 13" am: 079810e65b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: If563b6aa25bd8ddd0a0fa251dc777ccde2a95f7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 17:48:55 +00:00
Ruofei Ma
5ba37dc273 Revert "update performance-point for media performance class 13" am: 079810e65b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: Ia7b1e2131762d98a67bc0bdfbdbccd85caafe428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 17:47:43 +00:00
Ruofei Ma
e1121f430a Revert "update performance-point for media performance class 13" am: 079810e65b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18904119

Change-Id: Id689b6ebd4cdd35ade025c2baceeeb477b8325c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 17:47:19 +00:00
Ruofei Ma
079810e65b Revert "update performance-point for media performance class 13" 
This reverts commit 53eef4db82.

Reason for revert: We do not need to support media performance class 13 for P21 devices and this change is causing regression in P21 so we have to revert it.

Bug: 235027936

Change-Id: I51099b94ac635e001cd56dd6cd250b1b8e0bd9f4
 2022-06-16 17:26:14 +00:00
Terry Huang
3f394eac9c Enable Google Audio RIL library in PDK am: 944f48c3db am: fdcd49b12d am: 42b6c8f4eb am: 6b8df55282 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144

Change-Id: Iba5ffd2847aea02a0d50f3a0e29000efc0d1afe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 02:45:03 +00:00
Terry Huang
91791da067 Enable Google Audio RIL library in PDK am: 944f48c3db am: fc5d85dace am: b6dbe69613 am: 98ff1c950f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144

Change-Id: I9b8b3bc2e3fbbd87ce9c28668e4f07f42c9b08aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 02:44:51 +00:00
Terry Huang
20c1a66cdf Enable Google Audio RIL library in PDK am: 944f48c3db am: fc5d85dace am: 93835b1085 am: 4086c44d25 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144

Change-Id: Icc6e5116f9423f1e0579e385cfd6cd044087aeea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 02:44:37 +00:00
Terry Huang
6b8df55282 Enable Google Audio RIL library in PDK am: 944f48c3db am: fdcd49b12d am: 42b6c8f4eb 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144

Change-Id: I719d6ebbbf025f58c9b90e7bd91b9a4265f577eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 02:00:34 +00:00
Terry Huang
98ff1c950f Enable Google Audio RIL library in PDK am: 944f48c3db am: fc5d85dace am: b6dbe69613 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144

Change-Id: Id036f7a20012d999b048fb21b070647bbb5ef92a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 02:00:23 +00:00
Terry Huang
4086c44d25 Enable Google Audio RIL library in PDK am: 944f48c3db am: fc5d85dace am: 93835b1085 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144

Change-Id: Ia4d2b1dadcb5c890997e2c7600f6f3de06f11903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 02:00:07 +00:00
Terry Huang
42b6c8f4eb Enable Google Audio RIL library in PDK am: 944f48c3db am: fdcd49b12d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/18596144

Change-Id: I22e2b365912caba05eb9ecaceb3bf1e724354fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-16 01:44:51 +00:00