Commit graph

2023 commits

Author SHA1 Message Date
TreeHugger Robot
9060687fb3 [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev am: d359b24bb0 -s ours am: 3741225b05 -s ours am: 39cc19312b -s ours am: 3f567b7ba7 -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: I00a5979a04e420ed827087cb00c3b121075b0966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 21:54:58 +00:00
Jack Wu
05f824b2ba [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 41b0902cce -s ours am: d149946425 -s ours am: e357dce48a -s ours am: 3c55e33489 -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: I0f39e8c724f63c00809a3cb63d775d602a45e35c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 21:54:48 +00:00
TreeHugger Robot
3f567b7ba7 [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev am: d359b24bb0 -s ours am: 3741225b05 -s ours am: 39cc19312b -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: I4639f7bac352e616b9bf8afa89888960820007c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 21:01:38 +00:00
Jack Wu
3c55e33489 [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 41b0902cce -s ours am: d149946425 -s ours am: e357dce48a -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: Id52953a36a2e0c27f484dbe48395ab88d412c268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 21:01:35 +00:00
Kelly Zhang
94460042c0 Merge "Add regulation e-labels for F10." into tm-qpr-dev am: 7214e6edf7 am: 6ada70f8d4 am: ca6815f10c am: 0f580bfdf3
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22346322

Change-Id: Icbf0dcaeec88d8fbca88e0b7a8ed67564858dcc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 20:05:26 +00:00
Kelly Zhang
0f580bfdf3 Merge "Add regulation e-labels for F10." into tm-qpr-dev am: 7214e6edf7 am: 6ada70f8d4 am: ca6815f10c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22346322

Change-Id: If77d8bbe8d9500e21d214328576cb4ce7df31e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:32:12 +00:00
TreeHugger Robot
c9b1ceb48a Merge "audio: Merge telephony tuning tables" into tm-qpr-dev am: 6200a8c45d am: 347ad56880
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22346327

Change-Id: I7f9b653ecc4356903cfe3650cfacceaa6227685b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 19:18:14 +00:00
TreeHugger Robot
a85e82ce31 [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev am: d359b24bb0 -s ours am: 3741225b05 -s ours am: 39cc19312b -s ours am: b93d9bbdfe -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: I1ff91c9147668c385aa46660a742c6b66ac30bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:58:15 +00:00
Jack Wu
ae075806fa [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 41b0902cce -s ours am: d149946425 -s ours am: e357dce48a -s ours am: df1d68189c -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: Ia1c6c6da6c64ba9c9a301963c211d212c25713f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:58:08 +00:00
TreeHugger Robot
b93d9bbdfe [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev am: d359b24bb0 -s ours am: 3741225b05 -s ours am: 39cc19312b -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: I435ff66347e73a99f38de4696f8ff43d1ea4d726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:26:19 +00:00
Jack Wu
df1d68189c [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 41b0902cce -s ours am: d149946425 -s ours am: e357dce48a -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: I684238336382f5597beb1d10cd9935232be6d5e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:26:15 +00:00
TreeHugger Robot
347ad56880 Merge "audio: Merge telephony tuning tables" into tm-qpr-dev am: 6200a8c45d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22346327

Change-Id: I02ad34c972c7880a71ba2b7bc16901d812dc3694
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 18:08:34 +00:00
TreeHugger Robot
6200a8c45d Merge "audio: Merge telephony tuning tables" into tm-qpr-dev 2023-03-30 17:33:50 +00:00
Kelly Zhang
ca6815f10c Merge "Add regulation e-labels for F10." into tm-qpr-dev am: 7214e6edf7 am: 6ada70f8d4
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22346322

Change-Id: I8484f3efc6740d898a6eac285f2a162d2a4ccf0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:21:37 +00:00
TreeHugger Robot
39cc19312b [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev am: d359b24bb0 -s ours am: 3741225b05 -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: I2f5ce10746d3866fa53b7eab5be9d927de686212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:15:25 +00:00
Jack Wu
e357dce48a [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 41b0902cce -s ours am: d149946425 -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: Ia92e9537589f1bb9642a1ce817598cbaaa77ecfc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:15:21 +00:00
Kelly Zhang
6ada70f8d4 Merge "Add regulation e-labels for F10." into tm-qpr-dev am: 7214e6edf7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22346322

Change-Id: I7a05e5e8f16825a74be4dfaa8e775feb04dced17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 17:03:04 +00:00
TreeHugger Robot
3741225b05 [automerger skipped] Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev am: d359b24bb0 -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: I7b1b917a258cb1410009ef709491355b71420ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:49:39 +00:00
Jack Wu
d149946425 [automerger skipped] update AIDL IGoogleBattery manifest version to 2 am: 41b0902cce -s ours
am skip reason: Merged-In Ie5f652402e4d91748f7422139bf587aa9b626b43 with SHA-1 2b993f3c37 is already in history

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

Change-Id: Ic14e8ece7389fc73815f28b7f6cff944b7a79092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-30 16:49:30 +00:00
David Li
18717395f7 audio: QPR ver. tuning table release for Felix
- Optimize MBDRC settings fox improving quality in high sould pressure level, context(b/273340713)

Files from the latest attachment on b/276210360

Bug: 276210360
Test: verified by cartercheng@
Change-Id: I76619e82be9efca6a38f00df6e338ead81d069a2
2023-03-30 16:56:42 +08:00
Kelly Zhang
7214e6edf7 Merge "Add regulation e-labels for F10." into tm-qpr-dev 2023-03-30 06:49:21 +00:00
David Li
b939b77f91 audio: Merge telephony tuning tables
Handset:
Optimizing uplink noise suppression performance for SWB
- The performance before the optimization had severe noise leakage in noisy environments(much louder than competitor), sometimes the noise was masked in near-end speech and hard to hear, which caused a bad user experience.
- Work with ForteMedia for the optimization as b/271551346

Files from the latest attachment on b/276063202

Bug: 276063202
Test: verified by huangsean@
Change-Id: Ie347214835e18a43c561166cb24c94f5062057e8
2023-03-30 12:18:13 +08:00
TreeHugger Robot
d359b24bb0 Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev 2023-03-30 03:38:10 +00:00
Kelly
b5a21ef707 Add regulation e-labels for F10.
Bug: 263742720
Test: visual
Change-Id: Ib328754d12d81f1eb26e64cfe9849cd74b067bbc
2023-03-30 10:13:07 +08:00
TreeHugger Robot
b49c73935e Merge "Support specific stream aspect ratio" into tm-qpr-dev am: 91cd5577c6 am: d5ca51075d am: c8b6e9d5b2 am: 4bc685bd49
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22305590

Change-Id: Ie29702f2f390528c57122b4b26590780ad0f5172
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 11:38:07 +00:00
TreeHugger Robot
ad410b2019 Merge "Support specific stream aspect ratio" into tm-qpr-dev am: 91cd5577c6 am: d5ca51075d am: c8b6e9d5b2 am: 1166a0791a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22305590

Change-Id: I516e40b6376420006e07e311b57d2f40c94b42f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 11:37:53 +00:00
TreeHugger Robot
1166a0791a Merge "Support specific stream aspect ratio" into tm-qpr-dev am: 91cd5577c6 am: d5ca51075d am: c8b6e9d5b2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22305590

Change-Id: I48edfb7db96fa0c3711deb5f2e1670820bb40a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 11:10:46 +00:00
TreeHugger Robot
4bc685bd49 Merge "Support specific stream aspect ratio" into tm-qpr-dev am: 91cd5577c6 am: d5ca51075d am: c8b6e9d5b2
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22305590

Change-Id: Id0c1aac388e35df99b6f25c23819d196c2b46db7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 11:09:52 +00:00
TreeHugger Robot
c8b6e9d5b2 Merge "Support specific stream aspect ratio" into tm-qpr-dev am: 91cd5577c6 am: d5ca51075d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22305590

Change-Id: I9f1793162d0da4645e42f7765c9ce7f49ea0d1e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 10:38:20 +00:00
TreeHugger Robot
d5ca51075d Merge "Support specific stream aspect ratio" into tm-qpr-dev am: 91cd5577c6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22305590

Change-Id: I02c691861922b9715a5955c979bef8def088a840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-29 10:07:55 +00:00
TreeHugger Robot
91cd5577c6 Merge "Support specific stream aspect ratio" into tm-qpr-dev 2023-03-29 09:46:36 +00:00
David Li
6e35ee3dcc audio: Merge telephony tuning tables am: b67a58e3e9 am: 5ef9600313 am: 0d9b6419b7 am: 5fad604b13
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22242077

Change-Id: I45759a6994906f2cb63d3bfe22b27f086c0047fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 19:13:27 +00:00
David Li
8dafcabdae audio: Merge telephony tuning tables am: b67a58e3e9 am: 5ef9600313 am: 0d9b6419b7 am: f29f588b46
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22242077

Change-Id: I20238d8cb88a8bea7f33f891950742d0fd2c7e71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 18:41:47 +00:00
David Li
5fad604b13 audio: Merge telephony tuning tables am: b67a58e3e9 am: 5ef9600313 am: 0d9b6419b7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22242077

Change-Id: I7c6d17c2dbf3485f89b56b3474664150b71bfe52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:38:04 +00:00
David Li
f29f588b46 audio: Merge telephony tuning tables am: b67a58e3e9 am: 5ef9600313 am: 0d9b6419b7
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22242077

Change-Id: I6c93e5173931d523249b314f7421f7c49010fb76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:35:32 +00:00
David Li
0d9b6419b7 audio: Merge telephony tuning tables am: b67a58e3e9 am: 5ef9600313
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22242077

Change-Id: I8bd218e8296da4a64441209c48100df6d8c28976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 17:06:26 +00:00
David Li
5ef9600313 audio: Merge telephony tuning tables am: b67a58e3e9
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/22242077

Change-Id: I0a1d967913e750d1f966cd8328518a1a08506c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 16:37:07 +00:00
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