46cb1d9602
Merge commit '674b856c15206a23d9d8a22fbd936a4f3055894d' * commit '674b856c15206a23d9d8a22fbd936a4f3055894d': Fix java doc on FLAG_EXTERNAL.