tree 9f42b2117219a99095fbe33bd403395c25bc9d19
parent 4e345ab7df737592528e99db73612c6b37e34545
parent 42a23783aaabdb4e6f37ccd822d8c85f31ba8519
author Dianne Hackborn <hackbod@google.com> 1291788460 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1291788460 -0800

am 42a23783: Merge "Add more checks for bad values to protect from corrupt files." into gingerbread

* commit '42a23783aaabdb4e6f37ccd822d8c85f31ba8519':
  Add more checks for bad values to protect from corrupt files.