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