Commit graph

2905 commits

Author SHA1 Message Date
Kris Chen
a2488ea8e1 o6r4: Enable LHBM control from UDFPS HAL am: 36cf68c142 am: b68081d299 am: d2ae3e161f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17823363

Change-Id: I7d8e03138811c63c4ba92e675bddaac8e02944b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 03:17:50 +00:00
Kris Chen
d2ae3e161f o6r4: Enable LHBM control from UDFPS HAL am: 36cf68c142 am: b68081d299
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17823363

Change-Id: I90a339390eb3115f9c162defc3ee8bc7cfe4664a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 02:44:19 +00:00
Kris Chen
b68081d299 o6r4: Enable LHBM control from UDFPS HAL am: 36cf68c142
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17823363

Change-Id: I7f574284f6b8a758348d7d17267f0e36f5fbc966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 02:19:26 +00:00
Xin Li
c7f49d074a [automerger skipped] Merge SP2A.220505.002 am: ea34fafe0d -s ours am: 9952235a7c -s ours am: cad1142076 -s ours am: 60636d0091 -s ours
am skip reason: Merged-In Iff092322df7a366281dcf89d8c9987064b6347f8 with SHA-1 6414ff31c8 is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2086347

Change-Id: I0d4dcdb3a55b8f35864e21edab69c583f89b474a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 21:50:23 +00:00
Xin Li
60636d0091 [automerger skipped] Merge SP2A.220505.002 am: ea34fafe0d -s ours am: 9952235a7c -s ours am: cad1142076 -s ours
am skip reason: Merged-In Iff092322df7a366281dcf89d8c9987064b6347f8 with SHA-1 6414ff31c8 is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2086347

Change-Id: Id494123b9ece6c84dd5b0e2e6b3aa20b7984956c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 21:28:20 +00:00
Xin Li
cad1142076 [automerger skipped] Merge SP2A.220505.002 am: ea34fafe0d -s ours am: 9952235a7c -s ours
am skip reason: Merged-In Iff092322df7a366281dcf89d8c9987064b6347f8 with SHA-1 6414ff31c8 is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2086347

Change-Id: I8e1d6326c90c7d4ee3b42bb5b1fddc49a4eeafb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 21:20:10 +00:00
Xin Li
9952235a7c [automerger skipped] Merge SP2A.220505.002 am: ea34fafe0d -s ours
am skip reason: Merged-In Iff092322df7a366281dcf89d8c9987064b6347f8 with SHA-1 6414ff31c8 is already in history

Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2086347

Change-Id: I2c4bf230313090498fabe5abf7ad51b921df5286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 20:56:54 +00:00
Kris Chen
36cf68c142 o6r4: Enable LHBM control from UDFPS HAL
Bug: 229716695
Bug: 224573604
Test: build and test fingerprint on device.
Change-Id: Ic181d43e296fbb56772852e3c8f892c33fbe248f
2022-05-05 02:59:41 +08:00
Xin Li
ea34fafe0d Merge SP2A.220505.002
Bug: 231319788
Merged-In: Iff092322df7a366281dcf89d8c9987064b6347f8
Change-Id: Ia64f524afce21cb5fde0e2c9f92fbd5da43388db
2022-05-03 20:52:13 +00:00
Jean-Michel Trivi
ff7a40f9d7 [automerger skipped] DO NOT MERGE Revert "Oriole/Raven: enable Dolby DD+ decoder" am: 0394338444 -s ours am: 8442fcf534 -s ours am: 148bfa5201 -s ours
am skip reason: Merged-In I030739e6d9772671b160e21afe62579a1bf3b987 with SHA-1 c0d282f6b7 is already in history

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

Change-Id: I6a88a7c3b9ece1d2d6c546b2c2d738aa8dcab25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:43:44 +00:00
Jean-Michel Trivi
f333a21d9f [automerger skipped] DO NOT MERGE Revert "Oriole/Raven: enable Dolby DD+ decoder" am: 0394338444 -s ours am: 8442fcf534 -s ours am: 0a1b3a8d16 -s ours
am skip reason: Merged-In I030739e6d9772671b160e21afe62579a1bf3b987 with SHA-1 c0d282f6b7 is already in history

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

Change-Id: I24c6c4c347e8878b9340431ad6d3204626ba14f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:36:07 +00:00
Jean-Michel Trivi
cdaf50ac6e [automerger skipped] DO NOT MERGE Revert "Oriole/Raven: enable Dolby DD+ decoder" am: 0394338444 -s ours am: d9b368145c -s ours am: 9d3b48e7ab -s ours
am skip reason: Merged-In I030739e6d9772671b160e21afe62579a1bf3b987 with SHA-1 c0d282f6b7 is already in history

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

Change-Id: I06d4ee553848c140c2cb2f98970d8b466155a597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:35:54 +00:00
Jean-Michel Trivi
0a1b3a8d16 [automerger skipped] DO NOT MERGE Revert "Oriole/Raven: enable Dolby DD+ decoder" am: 0394338444 -s ours am: 8442fcf534 -s ours
am skip reason: Merged-In I030739e6d9772671b160e21afe62579a1bf3b987 with SHA-1 c0d282f6b7 is already in history

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

Change-Id: I9ece13009130ec8491b9429377612f47a36f9ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:27:37 +00:00
Jean-Michel Trivi
148bfa5201 [automerger skipped] DO NOT MERGE Revert "Oriole/Raven: enable Dolby DD+ decoder" am: 0394338444 -s ours am: 8442fcf534 -s ours
am skip reason: Merged-In I030739e6d9772671b160e21afe62579a1bf3b987 with SHA-1 c0d282f6b7 is already in history

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

Change-Id: Ia0ec54151d55cfbdc600a2d8a2efb43dd254236a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:27:24 +00:00
Jean-Michel Trivi
9d3b48e7ab [automerger skipped] DO NOT MERGE Revert "Oriole/Raven: enable Dolby DD+ decoder" am: 0394338444 -s ours am: d9b368145c -s ours
am skip reason: Merged-In I030739e6d9772671b160e21afe62579a1bf3b987 with SHA-1 c0d282f6b7 is already in history

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

Change-Id: I563f59f1afe3da3b204f32774a801a522f2dbf8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:18:24 +00:00
Jean-Michel Trivi
8442fcf534 [automerger skipped] DO NOT MERGE Revert "Oriole/Raven: enable Dolby DD+ decoder" am: 0394338444 -s ours
am skip reason: Merged-In I030739e6d9772671b160e21afe62579a1bf3b987 with SHA-1 c0d282f6b7 is already in history

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

Change-Id: Ie77e27ecfe30726014341663868296b94208d18c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:02:13 +00:00
Jean-Michel Trivi
d9b368145c [automerger skipped] DO NOT MERGE Revert "Oriole/Raven: enable Dolby DD+ decoder" am: 0394338444 -s ours
am skip reason: Merged-In I030739e6d9772671b160e21afe62579a1bf3b987 with SHA-1 c0d282f6b7 is already in history

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

Change-Id: Ia82521717b993470451140676783bf91efe9eb2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 08:00:50 +00:00
Jean-Michel Trivi
0394338444 DO NOT MERGE Revert "Oriole/Raven: enable Dolby DD+ decoder"
This reverts commit 8074cbccb4.

Reason for revert: sc-v2 revert didn't merge to tm-dev

Change-Id: I5d06dd165257f00487cb66b2e66b4f0d4aa71f4e
Merged-In: I030739e6d9772671b160e21afe62579a1bf3b987
2022-05-02 07:40:11 +00:00
Victor Liu
515ff5ad08 uwb: calibration am: 8d127489da am: c15ed1f8e6 am: 2b751c0e3f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/18102786

Change-Id: Ia002225b98c69984b148ae17362ea91299b0b6fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 02:09:40 +00:00
Victor Liu
96b1e08f00 uwb: calibration am: 8d127489da am: 9238a83a6b am: 3316bad109
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/18102786

Change-Id: Ie4f6d8a5b7c18724935ff1224d44b3e146243576
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 02:09:33 +00:00
Victor Liu
f42461b2d9 uwb: calibration am: 8d127489da am: c15ed1f8e6 am: 48f3f7bbbd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/18102786

Change-Id: I67eefdd68faddf9f9f794355c73dc51a7b8125dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 02:09:22 +00:00
Victor Liu
2b751c0e3f uwb: calibration am: 8d127489da am: c15ed1f8e6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/18102786

Change-Id: Idfb2b41ab5ac1089c4ee8dfcd544f6f00d816934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 01:46:01 +00:00
Victor Liu
48f3f7bbbd uwb: calibration am: 8d127489da am: c15ed1f8e6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/18102786

Change-Id: I2cec5886ea02200869d1692e251dbf2cd3591d0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 01:45:51 +00:00
Victor Liu
3316bad109 uwb: calibration am: 8d127489da am: 9238a83a6b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/18102786

Change-Id: I9bae63bfc521b13faa51bb67d510bd7fc816ddb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 01:45:50 +00:00
Victor Liu
c15ed1f8e6 uwb: calibration am: 8d127489da
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/18102786

Change-Id: If473beeb33236074265a02169b90078b5602f723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 01:21:10 +00:00
Victor Liu
9238a83a6b uwb: calibration am: 8d127489da
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/18102786

Change-Id: I43d82ab936805ca848e32586e770e7603df209b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-30 01:19:35 +00:00
Victor Liu
8d127489da uwb: calibration
update uwb calibrations

Bug: 230907571
Signed-off-by: Victor Liu <victorliu@google.com>
Change-Id: I20336a8a464e5342375d83684afe7b5dce72afb2
2022-04-30 01:01:49 +00:00
Automerger Merge Worker
7b47c2ba8a Merge "Boost trusty task priority during UDFPS am: cb17433a3d am: b524dd1a43" into tm-d1-dev-plus-aosp am: 1a50f7fbfd
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17927296

Change-Id: I5c858cc7274e6a7a6fee893a55e028918bbf20dd
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:00:37 +00:00
Wei Wang
fe45c82d0d Boost trusty task priority during UDFPS am: cb17433a3d am: 0a2dd8a783 am: 3ff92b1d13
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17927296

Change-Id: I1b440d5340f485bbd1a8315cf0f34f4bb2de8654
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 18:00:03 +00:00
Wei Wang
4691eae6d4 Boost trusty task priority during UDFPS am: cb17433a3d am: 0a2dd8a783 am: 33f10f22ac
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17927296

Change-Id: I4d910fd146c456b762ba8b9a820331c908052c57
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:59:40 +00:00
Automerger Merge Worker
1a50f7fbfd Merge "Boost trusty task priority during UDFPS am: cb17433a3d am: b524dd1a43" into tm-d1-dev-plus-aosp 2022-04-26 17:38:54 +00:00
Wei Wang
3ff92b1d13 Boost trusty task priority during UDFPS am: cb17433a3d am: 0a2dd8a783
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17927296

Change-Id: Icc67808165c483ada2626bee61df4d9da2a8115b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:45 +00:00
Wei Wang
52a7fbc1c1 Boost trusty task priority during UDFPS am: cb17433a3d am: b524dd1a43
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17927296

Change-Id: I60df914d5db17f8ed97ad274bf82c8bf16b98ba3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:45 +00:00
Wei Wang
33f10f22ac Boost trusty task priority during UDFPS am: cb17433a3d am: 0a2dd8a783
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17927296

Change-Id: I9ecb3faf58f8f4fe2047f36279958c20ed5dd1aa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:38:41 +00:00
Wei Wang
0a2dd8a783 Boost trusty task priority during UDFPS am: cb17433a3d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17927296

Change-Id: I3461c7ba4a93d9a7636c798b2a1a9ed6af71589f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:09:57 +00:00
Wei Wang
b524dd1a43 Boost trusty task priority during UDFPS am: cb17433a3d
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17927296

Change-Id: I0c0f3b7541b82b749a129d042ac36bc160bc01b8
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 17:09:24 +00:00
Wei Wang
cb17433a3d Boost trusty task priority during UDFPS
Bug: 229350721
Test: UDFPS with stress
Signed-off-by: Wei Wang <wvw@google.com>
Change-Id: Iae2c76409188c388e9ff30c5951bdb3e9118301a
2022-04-26 16:47:13 +00:00
Automerger Merge Worker
1d0fa4fe1c Merge "powerhal: update new boost uclamp value am: bd384b8661 am: 4aa9b45f63" into tm-d1-dev-plus-aosp am: 2e0717a513
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17943668

Change-Id: I2dac5cb2bb973867f7167daeb33059904f2c5183
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:26:39 +00:00
chungkai
7bb89507cc powerhal: update new boost uclamp value am: bd384b8661 am: 8b389f6c4f am: 3d3a04fd7e
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17943668

Change-Id: Ibae6fa838425a4980183938c3b90e7835d4e2fca
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:26:00 +00:00
chungkai
8ac55c359b powerhal: update new boost uclamp value am: bd384b8661 am: 8b389f6c4f am: adea38561c
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17943668

Change-Id: Ib8e977ef25e506ea19ac93730ee781072160bbff
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 07:25:44 +00:00
Automerger Merge Worker
2e0717a513 Merge "powerhal: update new boost uclamp value am: bd384b8661 am: 4aa9b45f63" into tm-d1-dev-plus-aosp 2022-04-26 06:44:04 +00:00
chungkai
ee100d2366 powerhal: update new boost uclamp value am: bd384b8661 am: 4aa9b45f63
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17943668

Change-Id: Iaf063912e81bebdf84cdf5ef2d4e7b4f2d1157af
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 06:43:49 +00:00
chungkai
3d3a04fd7e powerhal: update new boost uclamp value am: bd384b8661 am: 8b389f6c4f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17943668

Change-Id: I339f1356047acab9b9b6629eba3a8fbd3656d6b3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 06:43:48 +00:00
chungkai
adea38561c powerhal: update new boost uclamp value am: bd384b8661 am: 8b389f6c4f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17943668

Change-Id: If1684797a72b0a8b3520d7dbe5ef39bf04213c48
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 06:43:47 +00:00
chungkai
8b389f6c4f powerhal: update new boost uclamp value am: bd384b8661
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17943668

Change-Id: Ia33570fbebdbfd66f90a3c48e6e693ac8e96a09e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 06:21:42 +00:00
chungkai
4aa9b45f63 powerhal: update new boost uclamp value am: bd384b8661
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17943668

Change-Id: Ib4eb7f2b069f3b799a10c2cb6178e1593d87f1f9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-26 06:20:27 +00:00
chungkai
bd384b8661 powerhal: update new boost uclamp value
set 160 back to 161 since RT task will select
little cores

Test: build pass
Bug: 230247757
Signed-off-by: chungkai <chungkai@google.com>
Change-Id: I71b74b647f1b9904f4a6688a07c5e7b3a2841bd9
2022-04-26 02:06:23 +00:00
chungkai
de3535c351 powerhal: update new boost uclamp value am: c5f7e5fc7d am: 2d973d4490 am: 711a64e595
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17899778

Change-Id: I7e5fe4553b5040967a5e650bf1f34162309302d9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 21:58:54 +00:00
chungkai
eb590e8bf6 powerhal: update new boost uclamp value am: c5f7e5fc7d am: 2d973d4490 am: 0ce81927ce
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17899778

Change-Id: I4b605a17f6b8f2d4cb63c841b8b1c6e37302dc5e
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 21:52:24 +00:00
chungkai
9114d35d29 powerhal: update new boost uclamp value am: c5f7e5fc7d am: 07e5812fd5 am: 47bf371ced
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17899778

Change-Id: Ia65b3341c91fa16078adabfbd14f70bb235b0e3c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-22 21:51:57 +00:00