tree 88162736ad565672d0fd891c9ed15bc294888c61
parent cb8331d4301ddbc1606b122c199c9ef459006701
author Sorin Basca <sorinbasca@google.com> 1633448538 +0000
committer Sorin Basca <sorinbasca@google.com> 1633677451 +0000

Updating java.util.concurrent to 11+28

This merges in the changes for java.util.concurrent from 11+28.

It only contains the merge resolutions, without having the
necessary changes to make everything work. In order to help with
the review, those changes come in subsequent CLs.

The merge has been made using tools/upstream/merge-from-upstream.

The merging of conflicts was done as specified in
http://b/188889082 with the only notable difference that upstream
references to the Collections Framework were preserved since they
will be made to work as-is later on (see http://b/200009966).

Test: code inspection
Bug: 188889082
Change-Id: I5a22e6768fa12ba82222a7cef027fb8e346e0e8e