tree a40e2e9ee0d320635a46615d46b81df4954bd5b3
parent f252f44c66e7c88ceb00298f88309f8a7d737b30
parent 8ab086d0356f90bc1901d1c4e7e0687f6ac273c3
author Dave Burke <daveburke@google.com> 1336688991 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336688991 -0700

am 8ab086d0: am da66e667: Merge "Make decoder more robust to inaccurate ASCs." into jb-dev

* commit '8ab086d0356f90bc1901d1c4e7e0687f6ac273c3':
  Make decoder more robust to inaccurate ASCs.