am fb71733b: am 7c8258d0: Merge "Fix the last remaining @deprecated tag without comment warning." into gingerbread

Merge commit 'fb71733b352494cb6bc40b26f251dcd3ece63ed5'

* commit 'fb71733b352494cb6bc40b26f251dcd3ece63ed5':
  Fix the last remaining @deprecated tag without comment warning.