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

1586 commits

This branch
This branch
All branches
Author SHA1 Message Date
Erik Cheng
dcbc483a89 Support specific stream aspect ratio 
Add a property to indicate if support specific stream aspect ratio.

Bug: 267702291
Test: camera checklist
Change-Id: If58826654527f62d3bdbb70d6fe5580278e4171c
 2023-03-28 13:47:07 +08:00
David Li
b67a58e3e9 audio: Merge telephony tuning tables 
Handset:
Optimizing noise suppression for better performance

Handsfree:
Fix the kid's voice issue(the same issue reported from C10 P10) - P0
Reducing current peak of speakerphone to avoid trigger BATOILO frequently - P1
Finetune downlink performance of speakerphone to mitigate hissing speech - P1

Headset:
Leverage uplink setting from handsfree for headphones and TTY-VCO scenario

Files from the latest attachment on b/275032306

Bug: 275032306
Test: verified by huangsean@
Change-Id: I249e8d91d4be87db167d008c1dc8a6bb777f0802
 2023-03-28 13:32:43 +08:00
Automerger Merge Worker
8d4dfd1897 Merge "Merge "Enable adjusting link layer stats polling interval" into udc-dev am: 97cfb7872d am: bdc3ad919c" 2023-03-28 03:17:28 +00:00
Liang Li
ca9adc2f36 Merge "Enable adjusting link layer stats polling interval" into udc-dev am: 97cfb7872d am: bdc3ad919c 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22054235

Change-Id: Ic0ca3a0109d0d878c6314f6e9e23aa658e08040c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 03:17:01 +00:00
Liang Li
f17e295970 Merge "Enable adjusting link layer stats polling interval" into udc-dev am: 97cfb7872d am: 59819a1b83 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22054235

Change-Id: Iaddab19309925d876ca9ca1d9ba73aa16abff81c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 03:16:39 +00:00
Liang Li
bdc3ad919c Merge "Enable adjusting link layer stats polling interval" into udc-dev am: 97cfb7872d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22054235

Change-Id: Ifdf386400cdd2756a34339002d817b8ba2cc875b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 02:49:39 +00:00
Liang Li
59819a1b83 Merge "Enable adjusting link layer stats polling interval" into udc-dev am: 97cfb7872d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22054235

Change-Id: Id4634c939dc2ede9f55e7c55e17d70fbac3aea03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 02:48:41 +00:00
Liang Li
97cfb7872d Merge "Enable adjusting link layer stats polling interval" into udc-dev 2023-03-28 02:40:51 +00:00
Automerger Merge Worker
b09a550fc3 Merge changes from topic "am-4efc35de565d424bb9e72064ce761d2e" 
* changes:
  [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev-plus-aosp am: 9b871300cb -s ours am: bd0739fb8b -s ours am: 1eced777a4 -s ours
  [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 2b993f3c37 -s ours am: dc6117919e -s ours am: c0169601d3 -s ours
 2023-03-28 02:18:23 +00:00
TreeHugger Robot
12cbbcfeb1 [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev-plus-aosp am: 9b871300cb -s ours am: bd0739fb8b -s ours am: 1eced777a4 -s ours 
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 b2955ae224 is already in history

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

Change-Id: Ia20ea92d4e334325a8d04e4bfd2daef889bf2a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 02:18:02 +00:00
Jack Wu
5c659ed0be [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 2b993f3c37 -s ours am: dc6117919e -s ours am: c0169601d3 -s ours 
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 b2955ae224 is already in history

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

Change-Id: I295f9409410c7a0d1fa4c6842771b6a2b9fe9050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 02:17:54 +00:00
TreeHugger Robot
31f60ec1b9 [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev-plus-aosp am: 9b871300cb -s ours am: bd0739fb8b -s ours am: 7babc2ff6c -s ours 
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 b2955ae224 is already in history

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

Change-Id: I504f4e9fc7357eede9d7704c0c3be0c122999fc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 02:17:35 +00:00
Jack Wu
307b02c25a [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 2b993f3c37 -s ours am: dc6117919e -s ours am: 0b260d45bc -s ours 
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 b2955ae224 is already in history

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

Change-Id: I056704ced72bd63fcf8aa454148223f6a21a52fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 02:17:32 +00:00
TreeHugger Robot
1eced777a4 [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev-plus-aosp am: 9b871300cb -s ours am: bd0739fb8b -s ours 
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 b2955ae224 is already in history

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

Change-Id: I16ccd97791604a12e39566719bffd201a20b644a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:51:24 +00:00
Jack Wu
c0169601d3 [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 2b993f3c37 -s ours am: dc6117919e -s ours 
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 b2955ae224 is already in history

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

Change-Id: I84a0ee4fc7b43bcabe79f2647ccb952139e7c552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:51:18 +00:00
TreeHugger Robot
7babc2ff6c [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev-plus-aosp am: 9b871300cb -s ours am: bd0739fb8b -s ours 
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 b2955ae224 is already in history

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

Change-Id: I9d60e6166aa42a805f279216530595f442301aa2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:51:17 +00:00
Jack Wu
0b260d45bc [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 2b993f3c37 -s ours am: dc6117919e -s ours 
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 b2955ae224 is already in history

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

Change-Id: I18d442928260a304c907c85a7ffe86afc376f051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:51:13 +00:00
Automerger Merge Worker
4ee20478af Merge "Merge "Camera: Lower CPU min frequency for GCA_CAMERA_SHOT_ALLCPU" into tm-qpr-dev am: 34e623f4c7 am: eed02aafd7 am: 4993a8c17a am: 626a7ef022" 2023-03-28 01:35:15 +00:00
TreeHugger Robot
7d4c3ee6d3 Merge "Camera: Lower CPU min frequency for GCA_CAMERA_SHOT_ALLCPU" into tm-qpr-dev am: 34e623f4c7 am: eed02aafd7 am: 4993a8c17a am: f6ac3d1af1 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/21982323

Change-Id: Ia289e7dfe41f8d14cf981482c8f2d99c5df4b1ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:35:08 +00:00
TreeHugger Robot
03537c99fe Merge "Camera: Lower CPU min frequency for GCA_CAMERA_SHOT_ALLCPU" into tm-qpr-dev am: 34e623f4c7 am: eed02aafd7 am: 4993a8c17a am: 626a7ef022 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/21982323

Change-Id: I53454ffad7222c23c5f109243b0dc21d8436b5d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:35:08 +00:00
TreeHugger Robot
bd0739fb8b [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev-plus-aosp am: 9b871300cb -s ours 
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 b2955ae224 is already in history

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

Change-Id: Ib5542710fd6d4eec95e21dbf88af5a6d6328249d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:22:31 +00:00
Jack Wu
dc6117919e [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 2b993f3c37 -s ours 
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 b2955ae224 is already in history

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

Change-Id: Icb764b1e4d146da00336f5c9dd0333aa21cdee4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:22:29 +00:00
TreeHugger Robot
626a7ef022 Merge "Camera: Lower CPU min frequency for GCA_CAMERA_SHOT_ALLCPU" into tm-qpr-dev am: 34e623f4c7 am: eed02aafd7 am: 4993a8c17a 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/21982323

Change-Id: I6dcb736f548efbac6a56abcb9c356cfd0fbe22fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:10:01 +00:00
TreeHugger Robot
f6ac3d1af1 Merge "Camera: Lower CPU min frequency for GCA_CAMERA_SHOT_ALLCPU" into tm-qpr-dev am: 34e623f4c7 am: eed02aafd7 am: 4993a8c17a 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/21982323

Change-Id: Ia7eac8d501e4a3c565c8940ea00af09c3980be66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 01:09:59 +00:00
Jack Wu
41b0902cce update AIDL IGoogleBattery manifest version to 2 
Bug: 274701302
Test: TH
Change-Id: Ie5f652402e4d91748f7422139bf587aa9b626b43
Merged-In: Ie5f652402e4d91748f7422139bf587aa9b626b43
Signed-off-by: Jack Wu <wjack@google.com>
(cherry picked from commit b2955ae224)
 2023-03-28 01:03:12 +00:00
TreeHugger Robot
9b871300cb Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev-plus-aosp 2023-03-28 00:57:45 +00:00
TreeHugger Robot
4993a8c17a Merge "Camera: Lower CPU min frequency for GCA_CAMERA_SHOT_ALLCPU" into tm-qpr-dev am: 34e623f4c7 am: eed02aafd7 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/21982323

Change-Id: I78cf5fb4617e367aca0f62434dc99fcb63fcbcc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 00:40:09 +00:00
TreeHugger Robot
eed02aafd7 Merge "Camera: Lower CPU min frequency for GCA_CAMERA_SHOT_ALLCPU" into tm-qpr-dev am: 34e623f4c7 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/21982323

Change-Id: I99078d67d321b4c58e6552038cbcb53c1193dd73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-28 00:11:15 +00:00
TreeHugger Robot
34e623f4c7 Merge "Camera: Lower CPU min frequency for GCA_CAMERA_SHOT_ALLCPU" into tm-qpr-dev 2023-03-27 23:42:00 +00:00
Jasmine Cha
b03f87d6a7 audio: update spatial audio tuning am: a65b291e37 am: de271d2402 am: 0248c103fb am: 7f6ffaaece 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22248644

Change-Id: I803a3043e9918e3f29cb81c8c81d7fd3020f0225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 18:28:22 +00:00
Jasmine Cha
e3c259040e audio: update spatial audio tuning am: a65b291e37 am: de271d2402 am: 0248c103fb am: 0ac2fd63dd 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22248644

Change-Id: Icba64de2587ac6dfacf15b10f81f3d8ab61955ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 18:11:17 +00:00
Jasmine Cha
7f6ffaaece audio: update spatial audio tuning am: a65b291e37 am: de271d2402 am: 0248c103fb 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22248644

Change-Id: Ie7fed56095141fbd382132a7a529c860bd5dc222
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 17:48:30 +00:00
Jasmine Cha
0ac2fd63dd audio: update spatial audio tuning am: a65b291e37 am: de271d2402 am: 0248c103fb 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22248644

Change-Id: I0fd8c1c8d5d7e487b023b05e9e64bdf8a9322f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 17:42:12 +00:00
Jasmine Cha
0248c103fb audio: update spatial audio tuning am: a65b291e37 am: de271d2402 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22248644

Change-Id: I32abe8f5504351ae64f777f5d97667319466fd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 16:54:30 +00:00
Jasmine Cha
de271d2402 audio: update spatial audio tuning am: a65b291e37 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22248644

Change-Id: I038d53ebdae269985de704b6e486b08e7e35c21f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 16:24:56 +00:00
Jasmine Cha
a65b291e37 audio: update spatial audio tuning 
1. Update spatial tuning profile to match transaural filter for QPR3 feature drop.
2. Update volume curve for DTMF & system sound for smooth loudness changes.

Bug: 275015500
Test: manual test from b/275015500#comment2

Change-Id: I197dc992b03b16b101f19a81b112e43568166526
Signed-off-by: Jasmine Cha <chajasmine@google.com>
 2023-03-24 16:45:04 +08:00
Jack Wu
2b993f3c37 update AIDL IGoogleBattery manifest version to 2 
Bug: 274701302
Test: TH
Change-Id: Ie5f652402e4d91748f7422139bf587aa9b626b43
Merged-In: Ie5f652402e4d91748f7422139bf587aa9b626b43
Signed-off-by: Jack Wu <wjack@google.com>
(cherry picked from commit b2955ae224)
 2023-03-24 14:46:35 +08:00
Dylan Tian
b32a20b5e6 Merge "Update final F10 BT SAR table" into udc-d1-dev am: f82828775b 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22198024

Change-Id: I89ef54c10275ecf3d24765a2f2404f1880b9ae31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 06:35:13 +00:00
Dylan Tian
f82828775b Merge "Update final F10 BT SAR table" into udc-d1-dev 2023-03-24 06:12:18 +00:00
Darren Hsu
80a9ceac24 powerstats: Add 1Hz stats for inner display am: e63f8f4cd7 am: 45e6fa35bf 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22216490

Change-Id: Ia2c0ff8e1d7ea9686678e9e1cb3e42931dda0054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 03:25:19 +00:00
Darren Hsu
ce6bd32160 powerstats: Add 1Hz stats for inner display am: e63f8f4cd7 am: ee0691ef80 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22216490

Change-Id: I146ccd4bd5a6270d1dc7be22c8258cbe29f78cb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 03:24:24 +00:00
Darren Hsu
45e6fa35bf powerstats: Add 1Hz stats for inner display am: e63f8f4cd7 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22216490

Change-Id: Iad2de0f6d3c09f398ad37c6d23e00460bb01f028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 02:56:54 +00:00
Darren Hsu
ee0691ef80 powerstats: Add 1Hz stats for inner display am: e63f8f4cd7 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22216490

Change-Id: I0b9df4e2c1622d4ec3dca6d194f53bca0358d2c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-24 02:56:14 +00:00
Andy Hung
61470c6be3 Merge "Disable transaural spatialization by default" into tm-qpr-dev am: 7d81772064 am: 3a20650585 am: a828ad9d2d am: 70ca8dc7e4 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22142641

Change-Id: Ic3424a6bf1923871e45b02ed4d15bea455ce2fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 15:11:08 +00:00
Andy Hung
70ca8dc7e4 Merge "Disable transaural spatialization by default" into tm-qpr-dev am: 7d81772064 am: 3a20650585 am: a828ad9d2d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22142641

Change-Id: Ia9396f1ede2cad5dc12c2d9e2f1612c64ffc2229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-23 14:53:31 +00:00
Darren Hsu
e63f8f4cd7 powerstats: Add 1Hz stats for inner display 
Bug: 273636406
Test: dumpsys android.hardware.power.stats.IPowerStats/default
Change-Id: Idef91358f5c531febbbdd48e7282c50f036373c0
Signed-off-by: Darren Hsu <darrenhsu@google.com>
 2023-03-23 15:54:06 +08:00
Andy Hung
1878461d8e Merge "Disable transaural spatialization by default" into tm-qpr-dev am: 7d81772064 am: 3a20650585 am: a828ad9d2d am: 7a88c675e3 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22142641

Change-Id: Ia5d7bd33faf5018fe8b88da07b6027e220c65ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 22:54:49 +00:00
Andy Hung
7a88c675e3 Merge "Disable transaural spatialization by default" into tm-qpr-dev am: 7d81772064 am: 3a20650585 am: a828ad9d2d 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22142641

Change-Id: I2a7641b97b55aeef4b2f1f198c110e4b737fca86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 13:51:20 +00:00
Andy Hung
a828ad9d2d Merge "Disable transaural spatialization by default" into tm-qpr-dev am: 7d81772064 am: 3a20650585 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22142641

Change-Id: I936c3236ec21514e93e63f6b0231770562dc5bf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 13:13:49 +00:00
Andy Hung
3a20650585 Merge "Disable transaural spatialization by default" into tm-qpr-dev am: 7d81772064 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22142641

Change-Id: I476097231cefc29c8487e42f9ae9aed81b18d941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 12:55:51 +00:00