diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-08-08 18:22:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-08-08 18:22:05 +0000 |
| commit | b90a406ee3e66591e55a94916e32c6b79d582279 (patch) | |
| tree | 322dd1d8421921df5892a2d797ca559a01bc0f8a /include/ScopedJavaUnicodeString.h | |
| parent | 5bb4ad5d54ae0fdc13bb8b98a188cb40d1c4fb70 (diff) | |
| parent | 76140645b5494eacb27b3a91acf68b4c74dcd211 (diff) | |
Merge changes from topic "reiwa_o_cts" into oreo-cts-dev
* changes:
DO NOT MERGE [CtsLibcoreOjTestCases] Old Android releases can optionally support the new Japanese era
DO NOT MERGE New Japanese Era test changes with actual Reiwa name (part 2)
DO NOT MERGE New Japanese Era test changes with actual Reiwa name
DO NOT MERGE New Japanese Era test changes in ojluni with a placeholder name
Diffstat (limited to 'include/ScopedJavaUnicodeString.h')
0 files changed, 0 insertions, 0 deletions