Integrated: Merge jdk:master

[J.Duke]

On Mon, 7 Dec 2020 15:56:13 GMT, J. Duke <duke at openjdk.org> wrote:

> Hi all,
> 
> this is an _automatically_ generated pull request to notify you that there is 1 commit from the branch `jdk:master`that can **not** be merged into the branch `master`:
> 
> The following files contains merge conflicts:
> 
> - make/autoconf/flags.m4
> - make/autoconf/toolchain.m4
> 
> All Committers in this [project](https://openjdk.java.net/census#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.git master
> 
> # Fetch and checkout the branch for this pull request
> $ git fetch https://github.com/openjdk-bot/mobile.git +6:openjdk-bot-6
> $ git checkout openjdk-bot-6
> 
> # 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.git openjdk-bot-6:6
> 
> _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

This pull request has now been integrated.

Changeset: 52510a6b
Author:    J. Duke <duke at openjdk.org>
Committer: Johan Vos <jvos at openjdk.org>
URL:       https://git.openjdk.java.net/mobile/commit/52510a6b
Stats:     4742 lines in 50 files changed: 1912 ins; 2492 del; 338 mod

Merge

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

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