tree e158c52828130a41acece15ac9b4f10ea39587ff
parent 88ed043d320a8771b102f984e57a88e372b4b934
parent 1e357f4610e788c3e5dea5dd2f01b26bb75c5e36
author Jean-Baptiste Queru <jbq@google.com> 1344456811 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344456811 -0700

am 1e357f46: am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."

* commit '1e357f4610e788c3e5dea5dd2f01b26bb75c5e36':
  Correct ID3::StringSize calculation for UCS-2 data.