Merge "Merge "Deprecate internal Calendar methods." am: e08bd750c8 am: 5144cd445a am: 30ce9c07ec" into oc-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-04-24 19:14:37 +00:00
committed by Android (Google) Code Review
3 changed files with 6 additions and 6 deletions

View File

@@ -19283,9 +19283,9 @@ package android.icu.util {
method protected final void computeGregorianFields(int);
method protected int computeGregorianMonthStart(int, int);
method protected int computeJulianDay();
method protected int computeMillisInDay();
method protected deprecated int computeMillisInDay();
method protected void computeTime();
method protected int computeZoneOffset(long, int);
method protected deprecated int computeZoneOffset(long, int);
method public int fieldDifference(java.util.Date, int);
method protected java.lang.String fieldName(int);
method protected static final long floorDivide(long, long);

View File

@@ -20785,9 +20785,9 @@ package android.icu.util {
method protected final void computeGregorianFields(int);
method protected int computeGregorianMonthStart(int, int);
method protected int computeJulianDay();
method protected int computeMillisInDay();
method protected deprecated int computeMillisInDay();
method protected void computeTime();
method protected int computeZoneOffset(long, int);
method protected deprecated int computeZoneOffset(long, int);
method public int fieldDifference(java.util.Date, int);
method protected java.lang.String fieldName(int);
method protected static final long floorDivide(long, long);

View File

@@ -19333,9 +19333,9 @@ package android.icu.util {
method protected final void computeGregorianFields(int);
method protected int computeGregorianMonthStart(int, int);
method protected int computeJulianDay();
method protected int computeMillisInDay();
method protected deprecated int computeMillisInDay();
method protected void computeTime();
method protected int computeZoneOffset(long, int);
method protected deprecated int computeZoneOffset(long, int);
method public int fieldDifference(java.util.Date, int);
method protected java.lang.String fieldName(int);
method protected static final long floorDivide(long, long);