tree a97b9a68692062dd63e0a61bc2fb4dae82ce75eb
parent 563c5451874291e5b4d71aaa7dd336a02269930e
parent 0f5893ee605099240e7481d79e1ce9ce25af115c
author vichang <vichang@google.com> 1548155943 -0800
committer android-build-merger <android-build-merger@google.com> 1548155943 -0800

Merge "Deprecate JapaneseCalendar.CURRENT_ERA"
am: 0f5893ee60

Change-Id: I29548ec04dd5a37d5a672430002b380ff56667d9