| commit | d99da5033e06bc41d5f16b5f70604c3c4dee09e4 | [log] [tgz] |
|---|---|---|
| author | Victor Chang <vichang@google.com> | Thu Nov 11 13:00:17 2021 +0000 |
| committer | Victor Chang <vichang@google.com> | Thu Nov 11 14:52:24 2021 +0000 |
| tree | c81b52c8215ee0827e151f0fedd08a2706053fac | |
| parent | 05a3c0915baebb2084ba95e70792132ed45e18a8 [diff] | |
| parent | 87184c1d8d3d0d3ceac9162f29f4670739284108 [diff] |
Merge files from jdk11u/jdk-11.0.13-ga into the expected_upstream branch List of files: ojluni/src/main/java/java/text/Collator.java ojluni/src/main/java/java/text/RuleBasedCollator.java Generated by tools/expected_upstream/ojluni_refresh_files.py Test: N/A Change-Id: I1e1767c40c9596193ee29145064bc646a024d435