git: openjdk/mobile: 2 new changesets

[duke]

Changeset: 0f4fb367
Author:    Jonathan Gibbons <jjg at openjdk.org>
Date:      2020-10-19 22:05:47 +0000
URL:       https://git.openjdk.java.net/mobile/commit/0f4fb367

8255032: Conflict between recent pushes breaks the build

Reviewed-by: redestad, vromero

! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java

Changeset: 011cfaec
Author:    duke <duke at openjdk.org>
Date:      2020-10-19 22:06:19 +0000
URL:       https://git.openjdk.java.net/mobile/commit/011cfaec

Automatic merge of jdk:master into master