tree eb3b056051d4aee682ae9ca7dd7768c2dc6529a5
parent f86b266c14d61887b91ba4cfd5e9531877ee455a
parent f22da1cf931bb9ae5d964106a138672ebb04fc02
author Wei Jia <wjia@google.com> 1439485668 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439485668 +0000

am f22da1cf: am d7146ce7: am 3bb658ac: am 4e86a483: am f51115bd: libstagefright: fix possible overflow in ID3.

* commit 'f22da1cf931bb9ae5d964106a138672ebb04fc02':
  libstagefright: fix possible overflow in ID3.