tree a43f2f4d21b65e25833399e604780d2240723704
parent bb00f2141da9f5af2f829ac3b57f7d950766d89a
parent 78cb8301f6dd8d9d5e9c22f4a98271a10e228a28
author Nikita Iashchenko <nikitai@google.com> 1556234744 -0700
committer android-build-merger <android-build-merger@google.com> 1556234744 -0700

Merge "Cleanup "NewEra" comment after implementing new Japanese Era"
am: 78cb8301f6

Change-Id: I6b9b8871dc6108cd9a056f289febc75f506b8953