Commit graph

3365 commits

Author SHA1 Message Date
Jimmy Shiu
c6b6043c39 ADPF: deprecate the reporting rate from property am: 1fef228c0f
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17013502

Change-Id: Icf18d3c6bbe4e97d184537207f897cf8be48a425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:07:46 +00:00
Xin Li
cd86b56214 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f026329efe -s ours am: 0679869453 -s ours am: 7f8fbddff2 -s ours am: 4545315e6b -s ours
am skip reason: Merged-In I34050f4f12e36e671bddc3ffeb7fe17a8a19a929 with SHA-1 08d806ddfd is already in history

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

Change-Id: I986a6af09173917553450c00abf401cae0fc014e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:49:46 +00:00
Jimmy Shiu
23fe85060a powerhint: Add Adpf Profiles for P21
Add Adpf Profiles:
1. REFRESH_120FPS
2. REFRESH_90FPS
3. REFRESH_60FPS
4. UiHighBoostWithoutPid
5. UiLowBoostWithoutPid
6. UiLowNoneBoost

Bug: 202158746
Test: boot to home
Change-Id: If203ca044b4894f785e14ba550c006904ca50720
2022-04-20 13:47:14 +00:00
Jimmy Shiu
1fef228c0f ADPF: deprecate the reporting rate from property
Use powerhint.json profile to define reporting rate.

Bug: 198379880
Test: build & manual test
Change-Id: I1da0b07755579e2735ec6a3202796c5da1cf5971
2022-04-20 13:47:14 +00:00
Xin Li
4545315e6b [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f026329efe -s ours am: 0679869453 -s ours am: 7f8fbddff2 -s ours
am skip reason: Merged-In I34050f4f12e36e671bddc3ffeb7fe17a8a19a929 with SHA-1 08d806ddfd is already in history

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

Change-Id: If8ee8d2faebbfb37e56d787a7383f7afaeca0471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 13:05:28 +00:00
Xin Li
9177762f56 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f026329efe -s ours am: 0679869453 -s ours am: 7f8fbddff2 -s ours am: 678984a949 -s ours am: 1d98e2be55 -s ours
am skip reason: Merged-In I34050f4f12e36e671bddc3ffeb7fe17a8a19a929 with SHA-1 08d806ddfd is already in history

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

Change-Id: I72298f615cc80ef9de330a079a3ec35249b8f486
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:17:13 +00:00
Xin Li
1d98e2be55 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f026329efe -s ours am: 0679869453 -s ours am: 7f8fbddff2 -s ours am: 678984a949 -s ours
am skip reason: Merged-In I34050f4f12e36e671bddc3ffeb7fe17a8a19a929 with SHA-1 08d806ddfd is already in history

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

Change-Id: I00f6ba24626f058b29395653074dd6154fdc2d86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:33:21 +00:00
Xin Li
678984a949 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f026329efe -s ours am: 0679869453 -s ours am: 7f8fbddff2 -s ours
am skip reason: Merged-In I34050f4f12e36e671bddc3ffeb7fe17a8a19a929 with SHA-1 08d806ddfd is already in history

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

Change-Id: If487455f351fe29fab0cf668f880b41f0b5a9f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 05:13:28 +00:00
Xin Li
7f8fbddff2 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f026329efe -s ours am: 0679869453 -s ours
am skip reason: Merged-In I34050f4f12e36e671bddc3ffeb7fe17a8a19a929 with SHA-1 08d806ddfd is already in history

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

Change-Id: Ib89ae77fbc7a8b71abf1e8f0a8e1d0d7874617a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:47:34 +00:00
Jason(HeWei) Sung
7bfad7f3e7 Revert "Enable load kernel modules in parallel" am: 7e6b11e758 am: be5923a18b am: ab53011919
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17799861

Change-Id: I2f163116c3dde0a6dc8959e286de74fe1a0a3614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 07:57:15 +00:00
Jason(HeWei) Sung
ab53011919 Revert "Enable load kernel modules in parallel" am: 7e6b11e758 am: be5923a18b
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17799861

Change-Id: Ib49235c691de62585fdee641d89e771ea21e1baa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 07:40:16 +00:00
Jason(HeWei) Sung
e67f3590ef Revert "Enable load kernel modules in parallel" am: 7e6b11e758 am: ee4ed6bf2a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17799861

Change-Id: I5d727e8ccaff7596f10011a730ee6f3c61985a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 07:39:47 +00:00
Jason(HeWei) Sung
be5923a18b Revert "Enable load kernel modules in parallel" am: 7e6b11e758
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17799861

Change-Id: I6a06f68e0db87e999d945fd1a20b1aa45c68f53e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 07:18:27 +00:00
Jason(HeWei) Sung
ee4ed6bf2a Revert "Enable load kernel modules in parallel" am: 7e6b11e758
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17799861

Change-Id: I998652ea1158ca57aa72292b451b1e07a36272ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 07:17:33 +00:00
Jason(HeWei) Sung
7e6b11e758 Revert "Enable load kernel modules in parallel"
Revert submission 17690765-r4o6b3_parallel_load_enable

Reason for revert: b/229115072
Reverted Changes:
I387f425b1:Enable load kernel modules in parallel
I374a25b3c:Enable load kernel modules in parallel
Ia13bcadd9:Revert "Revert "fix path for i2c peripheral device...

Change-Id: Ie2550a1265b95e986305497faf56a47bf57a5d9b
2022-04-19 05:32:10 +00:00
Xin Li
0679869453 [automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8433047 am: f026329efe -s ours
am skip reason: Merged-In I34050f4f12e36e671bddc3ffeb7fe17a8a19a929 with SHA-1 08d806ddfd is already in history

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

Change-Id: If6c58236de62e5d3db7097f269af06b2ddd84913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:08:18 +00:00
Xin Li
f026329efe Merge sc-v2-dev-plus-aosp-without-vendor@8433047
Bug: 226662282
Merged-In: I34050f4f12e36e671bddc3ffeb7fe17a8a19a929
Change-Id: Idfcfd64cf47aaf2cc2a06ae199b1085b54ee3652
2022-04-18 21:00:59 +00:00
Cole Faust
4208f0d629 Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c am: 5401044873 am: 39950f876f am: 554f21af52 am: f95692aee7
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I2056a825012f265d4790cd768fcabb71c4cf210c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 19:55:21 +00:00
Cole Faust
f95692aee7 Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c am: 5401044873 am: 39950f876f am: 554f21af52
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I4a8fdbea1a8d312c1150d42e8b8cbbfabc4bc321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 19:10:13 +00:00
Cole Faust
cc56e122f4 Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c am: 5401044873 am: 39950f876f am: a8f54c01bc
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I253a99f555fd9ff37d8868d8c416243a2d4f522f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 19:09:47 +00:00
Cole Faust
554f21af52 Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c am: 5401044873 am: 39950f876f
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I6fdc4bbc11b0c7bd8ec49fb8ff33379ad8293f32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 18:48:06 +00:00
Cole Faust
a8f54c01bc Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c am: 5401044873 am: 39950f876f
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: Icee381933e8bb8c92a588bd0fd073d591dec48f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 18:46:53 +00:00
Cole Faust
39950f876f Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c am: 5401044873
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I6b5a40b29856bc933aec0f6c851b28da9c800fd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 18:23:33 +00:00
Cole Faust
5401044873 Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8 am: 9452525c5c
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I619faa1257949c3c0bd5d6117589031d823ba3c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 17:54:05 +00:00
Cole Faust
9452525c5c Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" am: 50190420a8
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2065141

Change-Id: I5b85651b3d8297f4e271c3c60c56c0308dd7f579
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 17:31:28 +00:00
Cole Faust
50190420a8 Merge "Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT" 2022-04-15 17:11:34 +00:00
Bob Badour
bf8dba3a19 Non-module targets. am: fac5b05a41 am: 0b98b4ff78 am: d6fcff6139 am: ae40b57a4d am: cbe62ca1eb am: a2d5d9a62b
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: I939dff90ffa27157f624537f68cdb4790de39912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 00:33:45 +00:00
Bob Badour
818f1598c6 Non-module targets. am: fac5b05a41 am: 0b98b4ff78 am: d6fcff6139 am: ae40b57a4d am: 313c331b2c
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: I11686a2e57818e1f2c1daa22ab1f087ed973ec60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 00:04:56 +00:00
Bob Badour
a2d5d9a62b Non-module targets. am: fac5b05a41 am: 0b98b4ff78 am: d6fcff6139 am: ae40b57a4d am: cbe62ca1eb
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: Icf3d08fd49c297079f079da90d7419c405c28af1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 00:04:01 +00:00
Bob Badour
cbe62ca1eb Non-module targets. am: fac5b05a41 am: 0b98b4ff78 am: d6fcff6139 am: ae40b57a4d
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: I729e05f8786475feb2d95edd3f41d4fb63bc11fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:41:54 +00:00
Bob Badour
313c331b2c Non-module targets. am: fac5b05a41 am: 0b98b4ff78 am: d6fcff6139 am: ae40b57a4d
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: I17b05c4f483bdaab8d078f7a2ce4ee43934a14b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:40:17 +00:00
Bob Badour
ae40b57a4d Non-module targets. am: fac5b05a41 am: 0b98b4ff78 am: d6fcff6139
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: I90ed326d5bb7d1996cc9e35918438c01344542c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:20:37 +00:00
Bob Badour
d6fcff6139 Non-module targets. am: fac5b05a41 am: 0b98b4ff78
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: Iaae3044b72bb7d9b313f62c1e0a67093ef12891f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:44:41 +00:00
Bob Badour
0b98b4ff78 Non-module targets. am: fac5b05a41
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/2063428

Change-Id: I56c264ce196330c586c584fd3aec8c62364094d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 22:27:07 +00:00
Cole Faust
d48fc0b7db Replace PHONE_CAR_BOARD_CONFIG with more specific PHONE_CAR_BOARD_PRODUCT
The statement
```
include $(PHONE_CAR_BOARD_CONFIG)
```
is difficult to translate to the Starlark configuration file. Fortunately,
all the potential values of this variable have have similar structure, so
```
PHONE_CAR_BOARD_CONFIG := device/google_car/foo/BoardConfig.mk
....
include $(PHONE_CARD_BOARD_CONFIG)
```
can be changed to
```
PHONE_CAR_BOARD_PRODUCT := foo
....
include device/google_car/$(PHONE_CAR_BOARD_PRODUCT)/BoardConfig.mk
```

Bug: 190051051
Test: treehugger
Change-Id: Ic7563540a70670f42d73f6466860fadf7883fb86
2022-04-14 13:42:20 -07:00
Bob Badour
fac5b05a41 Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: I229f692e11eec9fa5a9beffd9d6ba811c378e82e
2022-04-13 13:07:02 -07:00
Eric Laurent
84ded29697 Revert "audio: add immersive output" am: 4c4c40aee6 am: 3fe408132a am: d6b27d48e8
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692481

Change-Id: I97c6d41e8bfc666dd32146a5dfe84979956c42f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 19:20:43 +00:00
Eric Laurent
d6b27d48e8 Revert "audio: add immersive output" am: 4c4c40aee6 am: 3fe408132a
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692481

Change-Id: Ie5f713e1a6d37f4df23bec25bf67f3cda8568d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 19:02:47 +00:00
Eric Laurent
3fe408132a Revert "audio: add immersive output" am: 4c4c40aee6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692481

Change-Id: I3e1940fe7fdabcd60dd5223022187aa6f01ef9af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 18:41:03 +00:00
Eric Laurent
acd8484a5a [automerge] Revert "audio: add immersive output" 2p: 4c4c40aee6 2p: 29f888e144
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692481

Bug: 223736548
Change-Id: Ib006d7ae8d6cc3c50bfcd3c6e5772d60e5b14697
2022-04-12 16:02:36 +00:00
Eric Laurent
29f888e144 [automerge] Revert "audio: add immersive output" 2p: 4c4c40aee6
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692481

Bug: 223736548
Change-Id: Ib1ac64324fcf82be9ef9c79f0bdca8af108522a6
2022-04-12 16:02:28 +00:00
Eric Laurent
4c4c40aee6 Revert "audio: add immersive output"
This reverts commit 432fc04f64.

Bug: 223736548
Test: make
Change-Id: I242dd4677d0e42e05bed443e4021ca44cddf4daf
2022-04-12 18:02:04 +02:00
Eric Laurent
dadfafe3a8 [automerger skipped] Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a am: bf45c918a4 -s ours am: 7a4168d9be -s ours am: 50f952b4e8 -s ours am: 97757b112a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4c552ee93703afc2adc0ffd1d4bca2a6b4295448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:06:19 +00:00
Eric Laurent
dbcf663220 [automerger skipped] Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081 am: 7044b7d704 -s ours am: f0d273077f -s ours am: 57f4f76588 -s ours am: 32906c516d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I35bd87c3d5aae33431e5ae5e825a0f5556907a53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:06:19 +00:00
Eric Laurent
e88678a4f7 [automerger skipped] Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp am: 7b77d473a7 -s ours am: 073a13490c -s ours am: f2cac81514 -s ours am: f9e270f775 -s ours
am skip reason: skipped by user elaurent

Original change: undetermined

Change-Id: Ic2b6eb9d1932fb973faea7772c06f3f0c4995948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:06:11 +00:00
Eric Laurent
9979dd8b62 resolve merge conflicts of 7b77d473a7 to tm-dev am: 5f85a1763f am: 89e4c5e249 am: 73de9e53f5
Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/17692477

Change-Id: I2282e6b41c4394f94be511934782a8d031bb6d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:05:34 +00:00
Eric Laurent
6daae39ea7 [automerger skipped] Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a am: bf45c918a4 -s ours am: 7a4168d9be -s ours am: 3da4f1d9f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b54e886c99e9739d4615367c1ef941dda7d2332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:02:44 +00:00
Eric Laurent
5abd668585 [automerger skipped] Revert "DO NOT MERGE Audio configuration for spatial audio" am: 10848fe081 am: 7044b7d704 -s ours am: f0d273077f -s ours am: fb22920496 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3685168511178e171d0bc40c5ac595a931319dd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:02:43 +00:00
Eric Laurent
d15b2bf8f6 [automerger skipped] Merge changes from topic "presubmit-am-1830507c0de2408caacf9436d85826eb" into sc-v2-dev-plus-aosp am: 7b77d473a7 -s ours am: 073a13490c -s ours am: 22fbe71785 -s ours
am skip reason: skipped by user elaurent

Original change: undetermined

Change-Id: Iae49ef4757b6f73a93ffd444d735fdc3c560413e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 15:00:04 +00:00
Eric Laurent
97757b112a [automerger skipped] Revert "DO NOT MERGE audio: add immersive output" am: 69e753be8a am: bf45c918a4 -s ours am: 7a4168d9be -s ours am: 50f952b4e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I646a6b710ca45f02344a48dc6cdf0b8379c04dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 14:45:00 +00:00