tree 50ce34e3ac31f1db90bd2c2992680e397f833ba7
parent 8319fadb99f5d862ed68d44a587b6f1fac2e0d2d
parent eecc406f462ef2b3a73cd6bf3c05f7cb45382276
author Robert Shih <robertshih@google.com> 1440206312 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440206312 +0000

am eecc406f: am 3b42241a: Merge "Prevent integer issues in ID3::Iterator::findFrame" into klp-dev

* commit 'eecc406f462ef2b3a73cd6bf3c05f7cb45382276':
  Prevent integer issues in ID3::Iterator::findFrame