tree e02b8ab105ca55afc5c26c6675294583a3f75d8c
parent b2bd470010279fe45e2848aa8cd0b3ad6f6ca800
parent 2c1dab44834fb20deda9f380dae1bd7c1826b40b
author Scott Main <smain@google.com> 1287192214 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287192214 -0700

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