tree 130d8eb412c78c23a62d2e0f094b615134e0f139
parent 0ec5338fec5ab4f39842066fb64534a155b1e314
parent 9c91d74747d890e1bf5ca3a444ec62838823c083
author Divya Sharma <c_shard@codeaurora.org> 1446658036 -0800
committer Divya Sharma <c_shard@codeaurora.org> 1446658036 -0800
mergetag object 9c91d74747d890e1bf5ca3a444ec62838823c083
 type commit
 tag android-6.0.0_r26
 tagger The Android Open Source Project <initial-contribution@android.com> 1446052353 -0700
 
 Android 6.0.0 release 26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlYxAgEACgkQ6K0/gZqxDniT5gCcDCqYATWhYtm3OCIUxSjVK/pd
 o4EAni1PB2s2i2l0WpYh/KjIyQDewL3n
 =KzoP
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.0_r26' into HEAD

Android 6.0.0 release 26

* tag 'android-6.0.0_r26':
  libvorbisidec: sanity check index of marker.
  Add sanity checks to fix crash
  Fix vorbis decoder crash due to out of bounds memory access

Change-Id: I2e7289c41e666c8a0da6152c2fb90375a915ebc6