am ebdac324: (-s ours) am 81fe092d: Merge "Make @deprecated without a comment...
am ebdac324: (-s ours) am 81fe092d: Merge "Make @deprecated without a comment an error DO NOT MERGE" into gingerbread
Merge commit 'ebdac324'
* commit 'ebdac324':
Make @deprecated without a comment an error DO NOT MERGE