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