RFR: Merge jdk:master

[J.Duke]

On Thu, 2 Jul 2020 16:53:57 GMT, J. Duke <duke at openjdk.org> wrote:

> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there are 20 commits from the branch
> `jdk:master`that can **not** be merged into the branch `master`:
> The following file contains merge conflicts:
> 
> - make/common/modules/LauncherCommon.gmk
> 
> All Committers in this [project](https://openjdk.java.net/census#Optional[mobile]) have access to my [personal
> fork](https://github.com/openjdk-bot/mobile) and can therefore help resolve these merge conflicts (you may want to
> coordinate who should do this). The following paragraphs will give an example on how to solve these merge conflicts and
> push the resulting merge commit to this pull request. The below commands should be run in a local clone of your
> [personal fork](https://wiki.openjdk.java.net/display/skara#Skara-Personalforks) of the
> [openjdk/mobile](https://github.com/openjdk/mobile) repository.  # Ensure target branch is up to date $ git checkout
> master $ git pull https://github.com/openjdk/mobile master
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/mobile +4:openjdk-bot-4
> $ git checkout openjdk-bot-4
> 
> # Merge the target branch
> $ git merge master
> 
> When you have resolved the conflicts resulting from the `git merge` command above, run the following commands to create
> a merge commit:
> $ git add paths/to/files/with/conflicts
> $ git commit -m 'Merge jdk:master'
> 
> 
> When you have created the merge commit, run the following command to push the merge commit to this pull request:
> 
> $ git push https://github.com/openjdk-bot/mobile openjdk-bot-4:4
> 
> _Note_: if you are using SSH to push commits to GitHub, then change the URL in the above `git push` command accordingly.
> 
> Thanks,
> J. Duke

/integrate

-------------

PR: https://git.openjdk.java.net/mobile/pull/8