From 7f5095ddfeb3ce0f87e0afdec128a04171252932 Mon Sep 17 00:00:00 2001
From: Tobias Thierer <tobiast@google.com>
Date: Wed, 17 Aug 2016 17:11:01 +0000
Subject: [PATCH] Revert "Revert "Track libcore update of Map classes to
 jdk8u60""

Automerger issues have been resolved. This change needs
to be rolled forward once Automerger merges
http://r.android.com/255655 from mirror-aosp-master into
stage-aosp-master.

This reverts commit 778321361132672ea1174e4ca3f5397477c32690.

Change-Id: I16e1d94351ccf7cc1aeb8f9905410cd23514e8ff
---
 api/test-current.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/api/test-current.txt b/api/test-current.txt
index 1919abff0d0f1..1a1a43a33fd65 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -58835,9 +58835,17 @@ package java.util {
     ctor public HashMap();
     ctor public HashMap(java.util.Map<? extends K, ? extends V>);
     method public java.lang.Object clone();
+    method public V compute(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);
+    method public V computeIfAbsent(K, java.util.function.Function<? super K, ? extends V>);
+    method public V computeIfPresent(K, java.util.function.BiFunction<? super K, ? super V, ? extends V>);
     method public java.util.Set<java.util.Map.Entry<K, V>> entrySet();
     method public void forEach(java.util.function.BiConsumer<? super K, ? super V>);
+    method public V getOrDefault(java.lang.Object, V);
+    method public V merge(K, V, java.util.function.BiFunction<? super V, ? super V, ? extends V>);
+    method public V putIfAbsent(K, V);
+    method public boolean remove(java.lang.Object, java.lang.Object);
     method public boolean replace(K, V, V);
+    method public V replace(K, V);
     method public void replaceAll(java.util.function.BiFunction<? super K, ? super V, ? extends V>);
   }