am 69f8370a: Merge "Fix javadoc @char instead of @code."

* commit '69f8370ab94822ee77b6fe26b3f32b7e1786467d':
  Fix javadoc @char instead of @code.