tree a40e2e9ee0d320635a46615d46b81df4954bd5b3
parent 0bf474261dc5656990ecc25af63f3b2d125b2b20
parent da66e667840de77d3b9a9a094bbf12f43975d7e0
author Dave Burke <daveburke@google.com> 1336688759 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336688759 -0700

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

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