tree 8749405418967a35dc5287f3e478c8ef3f484589
parent 05a6c6caa84be1e2c3867bada77c715b53aca5db
parent 50ffc0828ff3d60a107ff5c694af56765a27cdcd
author Nikita Iashchenko <nikitai@google.com> 1556235046 -0700
committer android-build-merger <android-build-merger@google.com> 1556235046 -0700

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

Change-Id: Ifaae6c347a3ca0ab1cca24d4149d72ed4e17cb0e