commit b02e693b9d4cdcd2cb49cb872e2074c14115de27
author Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:21:15 2015 -0800
committer Divya Sharma <c_shard@codeaurora.org> Wed Nov 04 09:21:15 2015 -0800
tree 4d3aabf948a6fcc9b317efbf225633c201ce2b0c
parent bd2f51df0d1ea5759e3f77228d4bc3193d97d281
parent 1d8c8dcb9e67665fed3e3800bc850fdc3b0f0700

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  sdk_atv_armv7: TV codecs have been separated, use them

Change-Id: I332f7d3e8fed1d13c2308a74e7bc3cad2bb6deec

products/sdk_atv_armv7.mk

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 @@
     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