tree d672efc9587b039b29c30f163c52aad8cdd82496
parent 2bc481861ab374f87c12b7bb816ff75ac46147f1
parent 5f11e95f0041e163e8aa9e429aec92c8ee942233
author Scott Main <smain@google.com> 1276825393 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276825393 -0700

am 5f11e95f: docs: small edits to catchup to edits made in html pushed live

Merge commit '5f11e95f0041e163e8aa9e429aec92c8ee942233' into gingerbread

* commit '5f11e95f0041e163e8aa9e429aec92c8ee942233':
  docs: small edits to catchup to edits made in html pushed live