tree cf47b564f789fb002e1530160580571cac90d0cf
parent 61c213ad54cde63e6ef288e8038bcdd605ddbfb2
parent 9773b6e9aeb27dc0164c57e8b38673834a9474bb
author kmccormick <kmccormick@google.com> 1364437613 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364437613 -0700

am 9773b6e9: am f508cb7b: am 571c01b4: am a8115d06: am f65b5d08: Merge "Doc update: typo" into jb-mr1.1-docs

* commit '9773b6e9aeb27dc0164c57e8b38673834a9474bb':
  Doc update: typo