diff options
author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-02-01 16:16:53 -0800 |
---|---|---|
committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-02-01 16:44:35 -0800 |
commit | 6ed67b2e600169010776823f8b6edbe39304d662 (patch) | |
tree | 4d3aabf948a6fcc9b317efbf225633c201ce2b0c | |
parent | bd2f51df0d1ea5759e3f77228d4bc3193d97d281 (diff) | |
parent | 7c939825540f6dcfd4b37932f0e0e0c6b10b4351 (diff) | |
download | android_device_google_atv-6ed67b2e600169010776823f8b6edbe39304d662.tar.gz android_device_google_atv-6ed67b2e600169010776823f8b6edbe39304d662.tar.bz2 android_device_google_atv-6ed67b2e600169010776823f8b6edbe39304d662.zip |
Merge tag 'android-6.0.1_r13' into 13.0HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0
Android 6.0.1 release 13
Ticket: CYNGNOS-1522
Change-Id: If8f3aa7b6747c3726eb01bae1ed5453bc6df6bae
-rw-r--r-- | products/sdk_atv_armv7.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/products/sdk_atv_armv7.mk b/products/sdk_atv_armv7.mk index e0f5aba..4740f24 100644 --- a/products/sdk_atv_armv7.mk +++ b/products/sdk_atv_armv7.mk @@ -32,6 +32,7 @@ PRODUCT_COPY_FILES := \ device/generic/goldfish/camera/media_codecs.xml:system/etc/media_codecs.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_audio.xml:system/etc/media_codecs_google_audio.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:system/etc/media_codecs_google_telephony.xml \ + frameworks/av/media/libstagefright/data/media_codecs_google_tv.xml:system/etc/media_codecs_google_tv.xml \ frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:system/etc/media_codecs_google_video.xml \ hardware/libhardware_legacy/audio/audio_policy.conf:system/etc/audio_policy.conf |