Commit be7dad89 authored by Nikita Iashchenko's avatar Nikita Iashchenko Committed by Victor Chang
Browse files

DO NOT MERGE Replace the placeholder Japanese era name in calendar.properties 

There are no corresponding changes in upstream, however, still replacing
new era placeholder with actual era name for consistency.

Bug: 131312444
Test: CtsLibcoreTestCases
Test: CtsLibcoreOjTestCases
Change-Id: If231c253a7797776189fc9e87779a9d674984b55
Merged-In: If231c253a7797776189fc9e87779a9d674984b55
(cherry picked from commit 076d67b4d27783a0a575bc0651d3a3b6f53117ca)
parent d4828ec1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment