tree ff0576083d577fd7b113d65970fa23a2d0110658
parent b245e31fa8dd1ad6a59ccf858154f3c7b92e0eb8
parent 9bbaa1564b81e97d3c26ad603a0d67789f275ed5
author Daniel Sandler <dsandler@android.com> 1300152282 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300152282 -0700

am 9bbaa156: (-s ours) am 45660662: Merge "Workaround unknown ERI indices." into gingerbread

* commit '9bbaa1564b81e97d3c26ad603a0d67789f275ed5':
  Workaround unknown ERI indices.