| commit | 501128c9d2c41768a7a813aac4b8bf4124d51296 | [log] [tgz] |
|---|---|---|
| author | kuanyuhuang <kuanyuhuang@google.com> | Fri Oct 28 10:13:40 2022 +0000 |
| committer | kuanyuhuang <kuanyuhuang@google.com> | Tue Nov 01 03:00:39 2022 +0000 |
| tree | e4e634d4c71685a72844d5d1a5cb579cba2fdbac | |
| parent | 03bc9a89ebbafb08ddaa4d664e532f41d62afacc [diff] |
[resolve conflict] BT: add sysprop to enable OPUS codec am: 932c8178a7 am: 044b8c4e1d Original change: https://googleplex-android-review.googlesource.com/c/device/google/raviole/+/20296724 Change-Id: I39f535bb13a9e4c9f48cd6f6db6373ddb9f50f55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-oriole.mk b/device-oriole.mk index a034a01..c8be815 100644 --- a/device-oriole.mk +++ b/device-oriole.mk
@@ -269,4 +269,3 @@ PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -
diff --git a/device-raven.mk b/device-raven.mk index b965539..d31a888 100644 --- a/device-raven.mk +++ b/device-raven.mk
@@ -280,4 +280,3 @@ PRODUCT_COPY_FILES += \ device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml endif -