tree 0584da93fe3ca6e5bada8dc6b1b784deda88a80f
parent 33df868bb35726d250c8a6d0ebd8c84749ffd51f
parent e42b18677e11d27fa1d3eaa1ffcb1f98c5fc8cbf
author Scott Main <smain@google.com> 1277851777 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1277851777 -0700

am e42b1867: am 4fb91d9f: docs: fix typo

Merge commit 'e42b18677e11d27fa1d3eaa1ffcb1f98c5fc8cbf' into gingerbread-plus-aosp

* commit 'e42b18677e11d27fa1d3eaa1ffcb1f98c5fc8cbf':
  docs: fix typo