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

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