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

3373 commits

This branch
This branch
All branches
Author SHA1 Message Date
Xin Li
9c5bf82aa3 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 2201804c6b -s ours am: 6e217905f3 -s ours am: 3178ffe865 -s ours 
am skip reason: Merged-In I56e2296651999e37048f8be4c53d7c5b9281666f with SHA-1 bca92bdc76 is already in history

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

Change-Id: Ie247f25562e3fd515a249dbfd4e1a77da2d8c26b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 08:29:54 +00:00
Xin Li
3178ffe865 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 2201804c6b -s ours am: 6e217905f3 -s ours 
am skip reason: Merged-In I56e2296651999e37048f8be4c53d7c5b9281666f with SHA-1 bca92bdc76 is already in history

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

Change-Id: Ic5fe62a1b7898212c7acd9cc794b320f717e4b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:43:59 +00:00
Xin Li
6e217905f3 [automerger skipped] Merge Android 12 QPR3 ab/8391262 am: 2201804c6b -s ours 
am skip reason: Merged-In I56e2296651999e37048f8be4c53d7c5b9281666f with SHA-1 bca92bdc76 is already in history

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

Change-Id: I51b157da898e69fc63a95e34f60d4c07b1285073
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-03 07:11:59 +00:00
Kelly Rossmoyer
dd1d961983 Revert "powerstats: set time limit as timeout for AoC" am: 7eb5f7e1db am: eb73b18611 am: 89303d1740 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17544421

Change-Id: I2415993b9b531cda8a341f6cb601b5bc578faf4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 23:24:32 +00:00
Kelly Rossmoyer
89303d1740 Revert "powerstats: set time limit as timeout for AoC" am: 7eb5f7e1db am: eb73b18611 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17544421

Change-Id: I9f5e4b84f7c5aabfecda536cc0fe6453ef86f6dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:55:49 +00:00
Kelly Rossmoyer
16d8ca1c84 Revert "powerstats: set time limit as timeout for AoC" am: 7eb5f7e1db am: fc0bb0e1b9 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17544421

Change-Id: I971da8bea6015709c0d51a4112fce7926b168b56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:55:17 +00:00
Kelly Rossmoyer
eb73b18611 Revert "powerstats: set time limit as timeout for AoC" am: 7eb5f7e1db 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17544421

Change-Id: I9604778d4f2293f7df563d03e1e1b843aaaf3752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:35:55 +00:00
Kelly Rossmoyer
fc0bb0e1b9 Revert "powerstats: set time limit as timeout for AoC" am: 7eb5f7e1db 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17544421

Change-Id: Iba19651ac1606fb38458b634e508bbdc59c87dde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 22:35:00 +00:00
Kelly Rossmoyer
7eb5f7e1db Revert "powerstats: set time limit as timeout for AoC" 
Revert "powerstats: set time limit as timeout for AoC"

Revert "powerstats: timeout mechanism for AoC data provider"

Revert submission 17442015-powerstats-aoc-timeout

Reason for revert: Causes PowerStatsHAL crashes (b/227578192)
Reverted Changes:
I9a9eb27fa:powerstats: set time limit as timeout for AoC
Ib70000580:powerstats: timeout mechanism for AoC data provide...
Ied599054c:Revert "powerstats: disable AoC power stats report...
Iaf5af43eb:powerstats: set time limit as timeout for AoC

Change-Id: I7b7a42d3f94769bf937a4d9693444a5f4550dc3f
 2022-04-01 22:16:22 +00:00
Xin Li
2201804c6b Merge Android 12 QPR3 ab/8391262 
Bug: 226662282
Merged-In: I56e2296651999e37048f8be4c53d7c5b9281666f
Change-Id: I53581f8c0cd4d3e220faf53468f4d571cb823f4c
 2022-04-01 20:32:11 +00:00
Eric Laurent
8aa2031c08 Revert "Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e"" am: 9e1de421e6 am: 942593b9f1 am: 1665284886 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17538129

Change-Id: Ia578848e174a852e082d01aace858717afbbb22f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:56:59 +00:00
Eric Laurent
1665284886 Revert "Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e"" am: 9e1de421e6 am: 942593b9f1 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17538129

Change-Id: Ib628fc41b29aa3ca8829e0319e460ee3bf531f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:34:43 +00:00
Eric Laurent
883a4012ae Revert "Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e"" am: 9e1de421e6 am: 24c26591e6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17538129

Change-Id: I6ba58e05214ed367a279f5ef962372b4076188f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:34:02 +00:00
Eric Laurent
942593b9f1 Revert "Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e"" am: 9e1de421e6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17538129

Change-Id: Ibe6804231633167acefa88e39e70b374d56eee02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:13:24 +00:00
Eric Laurent
24c26591e6 Revert "Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e"" am: 9e1de421e6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17538129

Change-Id: I2ebe42c9de5014c5c4a0743b99f9395ec66f2878
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-01 19:11:49 +00:00
Eric Laurent
9e1de421e6 Revert "Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e"" 
This reverts commit 2dc3c4cb18.

Reason for revert: Spatial audio demo

Change-Id: Ia3288900ca86f9555750c469385f365031d989f4
 2022-04-01 18:51:54 +00:00
shawnlin
c8d93dd9f7 Fixed status bar glitch for apps that access internal resource dimen 
Bring back old usage of status_bar_height, status_bar_height_portrait,
and status_bar_height_landscape by set the size containing cutout size.

Bug: 216782082
Test: make
Change-Id: I87467605520d5dd168c3b03ac3b699800bd96030
 2022-04-01 16:37:55 +08:00
Edwin Tung
bf18244071 [automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529478 am: bca92bdc76 -s ours am: df49a2dfc4 -s ours am: 39023c5078 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I497715ed3d0fcb638968eb0785c57351fb1335b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 06:03:47 +00:00
Edwin Tung
39023c5078 [automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529478 am: bca92bdc76 -s ours am: df49a2dfc4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6abbefbb83716a6f7903f7e7b96f58b2d65b960a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 05:41:28 +00:00
Edwin Tung
c459f64d5d [automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529478 am: bca92bdc76 -s ours am: df49a2dfc4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id3649a52d18b99395c2d282b9d873dae334f15c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 05:41:17 +00:00
Edwin Tung
df49a2dfc4 [automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529478 am: bca92bdc76 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I601d306c39afeb7bd2a862540762ba498eec0c12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 05:28:36 +00:00
Edwin Tung
bca92bdc76 [DO NOT MERGE] gps: update gps driver 129.20.23.529478 
Fix NI control plane issue
Add NFW IPC between AP and CP
Ignore RTI in cold start
Fix OnChip logging issue

Bug: 221337679
Bug: 216098015
Bug: 219856838
Bug: 213009701

Verify test: 224635609

Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner

Change-Id: I56e2296651999e37048f8be4c53d7c5b9281666f
 2022-03-31 05:12:19 +00:00
Edwin Tung
ab5cc45589 [automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529475 am: f1a2063e14 -s ours am: 8d71c97361 -s ours am: 8a7f261ef7 -s ours am: 2ff3ad5e1d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I041e24f9f8fd831e70b033f52689394239ed0701
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 01:37:17 +00:00
Edwin Tung
9fddb9266f [automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529475 am: f1a2063e14 -s ours am: 8d71c97361 -s ours am: 8a7f261ef7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifc6da6fd9b499132784cc09c05ff133d10d6c0a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 01:21:19 +00:00
Edwin Tung
2ff3ad5e1d [automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529475 am: f1a2063e14 -s ours am: 8d71c97361 -s ours am: 8a7f261ef7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib58e6f2f58ae6cbb7fc50569c9b6e8112d27fb9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 01:20:37 +00:00
Edwin Tung
8a7f261ef7 [automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529475 am: f1a2063e14 -s ours am: 8d71c97361 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibdea2d11208517b06d867cd45f9ae2d46183d447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 01:06:01 +00:00
Edwin Tung
8d71c97361 [automerger skipped] [DO NOT MERGE] gps: update gps driver 129.20.23.529475 am: f1a2063e14 -s ours 
am skip reason: skipped by user edwintung

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

Change-Id: I44b43b854d4c7e25235570bfe43e10209434b8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-31 00:41:26 +00:00
Eric Laurent
12744565de Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e" am: 2dc3c4cb18 am: f1279a480f 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17504352

Change-Id: I40b6612b32d13810bc4c0df2f8296e7e87d4c1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 18:52:03 +00:00
Eric Laurent
8b0b11c07c Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e" am: 2dc3c4cb18 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17504352

Change-Id: Ic5862e80c76aa6e455bf03b5806b350cffa4d0e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 18:30:37 +00:00
Eric Laurent
f1279a480f Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e" am: 2dc3c4cb18 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17504352

Change-Id: I4b662b1800c9a64d57a336cef58ec655dcbef0af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 18:29:37 +00:00
Eric Laurent
2dc3c4cb18 Revert "[automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e" 
This reverts commit 6618135690.

Reason for revert: Spatial audio demo

Change-Id: Ie44a31102cc6e335eaf922fa7c42c944a60b0920
 2022-03-30 18:02:56 +00:00
Edwin Tung
f1a2063e14 [DO NOT MERGE] gps: update gps driver 129.20.23.529475 
Add NFW IPC between AP and CP
Fix NI control plane issue
Ignore RTI in cold start
Fix OnChip logging issue

Bug: 216098015
Bug: 221337679
Bug: 219856838
Bug: 213009701

Verify test: 224635609

Test: atest VtsHalGnssTargetTest
atest CtsLocationGnssTestCases
atest GtsLocationTestCases
atest PtsChreTestRunner

Change-Id: I89fcf1f61fce350201e6b433895289d3a3912c61
 2022-03-30 11:33:18 +00:00
Darren Hsu
ef600420a6 powerstats: set time limit as timeout for AoC am: 0be3bbd083 am: fc431a1d88 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17442334

Change-Id: Ibbc491b79f554c165499c4cc69fbe49b557bb2de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 08:46:02 +00:00
Darren Hsu
fc431a1d88 powerstats: set time limit as timeout for AoC am: 0be3bbd083 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17442334

Change-Id: Icf49fc926ae7f9f3fa1e6fe38460af82dede7d60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 08:21:47 +00:00
Darren Hsu
ed1085fe2c powerstats: set time limit as timeout for AoC am: 0be3bbd083 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17442334

Change-Id: Ic7ef42374df0e6a1670ded9efca32463d838da5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 08:21:36 +00:00
Darren Hsu
0be3bbd083 powerstats: set time limit as timeout for AoC 
Bug: 219630658
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: I9a9eb27fab549f4351bcfae6e335e050c48fc753
Signed-off-by: Darren Hsu <darrenhsu@google.com>
 2022-03-30 08:05:25 +00:00
chungkai
b295a3e0f7 init: add uclamp threshold setting am: c99aafcbc9 am: 0cca5f4daa 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17178849

Change-Id: I41f99b97c0562da53f0a51a4fbaee5ef755fac33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 04:21:19 +00:00
chungkai
0cca5f4daa init: add uclamp threshold setting am: c99aafcbc9 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17178849

Change-Id: Ie36db30896bf8df686807aa18e85283de32ce1e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 04:04:32 +00:00
chungkai
5187868607 init: add uclamp threshold setting am: c99aafcbc9 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17178849

Change-Id: I03ba8333a0298c6844640169127ed73724487616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-30 04:04:22 +00:00
chungkai
c99aafcbc9 init: add uclamp threshold setting 
To filter tiny task, add uclamp threshold setting

Test: build and boot pass
Bug: 214098855
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: I20c7d5228b81b9ef27660f5b4d120b3c4c584276
 2022-03-30 03:50:02 +00:00
Presubmit Automerger Backend
627805fa57 [automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e am: 6618135690 am: 9b650e3fde 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17435542

Change-Id: I3156a2963417750fc0e82eec68523d8ee0f09ae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:45:07 +00:00
Presubmit Automerger Backend
9b650e3fde [automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e am: 6618135690 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17435542

Change-Id: I9b314238f148e65ddd1f96d83569ae832847f15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:00:39 +00:00
Presubmit Automerger Backend
975fa1b100 [automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e am: 6618135690 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17435542

Change-Id: Ibfb131ab3b1923ee74c6117fc11857bb1592424b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 18:00:12 +00:00
Presubmit Automerger Backend
6618135690 [automerge] Disable spatial audio feature 2p: 68f33d6043 am: 95c69ea86e 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17435542

Change-Id: I598c374685ab2e891054167fc0c69e8fe4fbcac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 17:37:26 +00:00
Presubmit Automerger Backend
95c69ea86e [automerge] Disable spatial audio feature 2p: 68f33d6043 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17435542

Bug: 225119469
Change-Id: I8e22f367c4815081e403f3f5c3d6be0b2928e193
 2022-03-29 14:10:50 +00:00
chungkai
60cd813765 sched: move sysfs to procfs am: abf92a16d6 am: c23a7cb09b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17469423

Change-Id: I2d2573ef7664b94f648d88f84f97c16d25e2ecc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 11:17:36 +00:00
chungkai
c23a7cb09b sched: move sysfs to procfs am: abf92a16d6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17469423

Change-Id: I953e0013844d82361a7c5c572c9f706665ec35a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 10:38:38 +00:00
chungkai
23b9ea959a sched: move sysfs to procfs am: abf92a16d6 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17469423

Change-Id: I58bd20844288125459045b174f91ece3db23d7f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 10:38:20 +00:00
chungkai
abf92a16d6 sched: move sysfs to procfs 
Modify the path of vendor_sched nodes

Test: work normally
Bug: 216207007
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: Id9d85bb742dbfe96cc7e9fe8572a6a610a9f592e
 2022-03-29 10:02:47 +00:00
Jenny Ho
68050af02b dumpstate: dump AACR related data am: 1549259d37 am: b0d6bce849 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/17442330

Change-Id: I80b0023b6bae73368b9939c0c0bc6ed782cd6623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-03-29 08:40:54 +00:00