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