Merge pull request #16361 from alalek:android_fix_javadoc
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 15 Jan 2020 19:42:35 +0000 (19:42 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 15 Jan 2020 19:42:35 +0000 (19:42 +0000)

Trivial merge