tree 488db13a095c1b8af7bc6468dc98376c1bcdf75c
parent f9a38d1774de5be650eba31d8b95a59fe9846b5f
parent faedd14a3aafac44286290d2a49a10eb21ab3872
author Joe Onorato <joeo@google.com> 1284662139 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284662139 -0700

am a85c4f16: am d5d13286: Merge "This was marked @Deprecated in the docs, but it was misspelled." into gingerbread

Merge commit 'a85c4f165137ab360879bd9129259690ab6ac05d'

* commit 'a85c4f165137ab360879bd9129259690ab6ac05d':
  This was marked @Deprecated in the docs, but it was misspelled.