tree 77b26cd14bf6ce39fe56c4437e9449dfdb8e3a5f
parent 3d94f0ea5b982c927552ddf9340b81781c63633a
parent 5d84cbd007fa1d9da9ba2319af2841576c6dc390
author vichang <vichang@google.com> 1556904690 -0700
committer android-build-merger <android-build-merger@google.com> 1556904690 -0700

Merge "Remove JapaneseCalendar.CURRENT_ERA from Android public SDK"
am: 5d84cbd007

Change-Id: I671d25b15283a252489286dbb0a9105332d97ce7