Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 19180693 authored by Tobias Thierer's avatar Tobias Thierer Committed by android-build-merger
Browse files

Merge "API: Update java.util.Date to OpenJDK8u60" am: a2343a7e am: d8d1d968

am: d6be4be6

Change-Id: Iebadb6be0a880ede9033f0cd03a4a53c7695dcb7
parents bb79257d d6be4be6
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -60574,6 +60574,7 @@ package java.util {
    method public boolean before(java.util.Date);
    method public java.lang.Object clone();
    method public int compareTo(java.util.Date);
    method public static java.util.Date from(java.time.Instant);
    method public deprecated int getDate();
    method public deprecated int getDay();
    method public deprecated int getHours();
@@ -60592,6 +60593,7 @@ package java.util {
    method public void setTime(long);
    method public deprecated void setYear(int);
    method public deprecated java.lang.String toGMTString();
    method public java.time.Instant toInstant();
    method public deprecated java.lang.String toLocaleString();
  }
+2 −0
Original line number Diff line number Diff line
@@ -64174,6 +64174,7 @@ package java.util {
    method public boolean before(java.util.Date);
    method public java.lang.Object clone();
    method public int compareTo(java.util.Date);
    method public static java.util.Date from(java.time.Instant);
    method public deprecated int getDate();
    method public deprecated int getDay();
    method public deprecated int getHours();
@@ -64192,6 +64193,7 @@ package java.util {
    method public void setTime(long);
    method public deprecated void setYear(int);
    method public deprecated java.lang.String toGMTString();
    method public java.time.Instant toInstant();
    method public deprecated java.lang.String toLocaleString();
  }
+2 −0
Original line number Diff line number Diff line
@@ -60665,6 +60665,7 @@ package java.util {
    method public boolean before(java.util.Date);
    method public java.lang.Object clone();
    method public int compareTo(java.util.Date);
    method public static java.util.Date from(java.time.Instant);
    method public deprecated int getDate();
    method public deprecated int getDay();
    method public deprecated int getHours();
@@ -60683,6 +60684,7 @@ package java.util {
    method public void setTime(long);
    method public deprecated void setYear(int);
    method public deprecated java.lang.String toGMTString();
    method public java.time.Instant toInstant();
    method public deprecated java.lang.String toLocaleString();
  }