tree 4d3aabf948a6fcc9b317efbf225633c201ce2b0c
parent bd2f51df0d1ea5759e3f77228d4bc3193d97d281
parent 1d8c8dcb9e67665fed3e3800bc850fdc3b0f0700
author Divya Sharma <c_shard@codeaurora.org> 1446657675 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446657675 -0800
mergetag object 1d8c8dcb9e67665fed3e3800bc850fdc3b0f0700
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052344 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAfgACgkQ6K0/gZqxDnjulwCgi1yNSo9vtRBIF+hMmILGjI2B
 C9cAniXsU5rSLnU8/QJDOL4WqSyTTOV9
 =kVCW
 -----END PGP SIGNATURE-----

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