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

* commit '9bbaa1564b81e97d3c26ad603a0d67789f275ed5':
  Workaround unknown ERI indices.
tree: cafc00670911caca00d26f0f2048a2ee8b5afa09
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE