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.