Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6' * commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6': Doc change: clean up droiddoc (cs) macros.
Merge commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6' * commit '8ee9ecc145c9e05faf13f4bcf5853c888760c1b6': Doc change: clean up droiddoc (cs) macros.