am 7747795a: Merge "These are not javadoc tags, they are annotations in sample...
am 7747795a: Merge "These are not javadoc tags, they are annotations in sample code. Escape them properly." into gingerbread
Merge commit '7747795a' into gingerbread-plus-aosp
* commit '7747795a':
These are not javadoc tags, they are annotations in sample code. Escape them properly.