tree 130d8eb412c78c23a62d2e0f094b615134e0f139
parent 223fed6c29fdab51ed38434c11f93b11832d2967
parent 33a503e1606e96608a06f7aefa72b6488b5e3b8e
author David Ng <dave@codeaurora.org> 1449710316 -0800
committer David Ng <dave@codeaurora.org> 1449710316 -0800
mergetag object 33a503e1606e96608a06f7aefa72b6488b5e3b8e
 type commit
 tag android-6.0.1_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1449526281 -0800
 
 Android 6.0.1 release 3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAlZmBAkACgkQ6K0/gZqxDnhQkQCeKFUKaOmMK9dw7GG3kKGoUH94
 k6MAnjBRriemVrRVLhUpH5mUn/pInajq
 =1Klk
 -----END PGP SIGNATURE-----

Merge tag 'android-6.0.1_r3' into 601r3

Android 6.0.1 release 3

* tag 'android-6.0.1_r3':
  libvorbisidec: sanity check index of marker.

Change-Id: I1405b66c933e391bec8d7dd33d21e6d40638c05d