am 2c1dab44: am fda5b19c: Merge "docs: fix typo; surface dev guide link in package description" into froyo

Merge commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b' into gingerbread-plus-aosp

* commit '2c1dab44834fb20deda9f380dae1bd7c1826b40b':
  docs: fix typo; surface dev guide link in package description