From 26e2c852e558b881aaa69cba985fb9c9a1793e05 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Fri, 13 Jan 2017 21:52:22 +0000
Subject: [PATCH] API: Update java.util.Date to OpenJDK8u60

Test: make update-api
Change-Id: I116e13977427e714c6dbe4a843687220fd18a043
---
 api/current.txt        | 2 ++
 api/system-current.txt | 2 ++
 api/test-current.txt   | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 343dd008e7188..b719395137e0d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -60578,6 +60578,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();
@@ -60596,6 +60597,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();
   }
 
diff --git a/api/system-current.txt b/api/system-current.txt
index a2bd6c5d817aa..bf853e5343a2d 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -64176,6 +64176,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();
@@ -64194,6 +64195,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();
   }
 
diff --git a/api/test-current.txt b/api/test-current.txt
index b72ba1b5b7449..c288d6465a42c 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -60669,6 +60669,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();
@@ -60687,6 +60688,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();
   }