am ebf7c559: am 43e0a530: Merge "Fix typo in generic.c."

* commit 'ebf7c559ffca9d286bc0063dd3b36f782ad067de':
  Fix typo in generic.c.