tree 81e3f34c8345b60f834f7ae515dab583345d0835
parent e0991296b9e716c3aca9d8f0b234431207160e0c
parent 64a74f6537a78ba2a12a43d36c3fc5bf1b34dacf
author Brad Fitzpatrick <bradfitz@android.com> 1280761325 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280761325 -0700

am ee34a49f: Add missing word from docs.

Merge commit 'ee34a49ffc92590cb59f3e17a3df136b67701529' into gingerbread-plus-aosp

* commit 'ee34a49ffc92590cb59f3e17a3df136b67701529':
  Add missing word from docs.