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

am: 8b2caae395

Change-Id: I7ef1ace4a696dc5b57ad42b7756e0e3a6efa5c83
This commit is contained in:
Joachim Sauer
2017-04-24 21:30:03 +00:00
committed by android-build-merger
3 changed files with 6 additions and 6 deletions

View File

@@ -19286,9 +19286,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

@@ -20789,9 +20789,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

@@ -19336,9 +19336,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);