commit 5216f11e462b9f17704c0ac9e193d2149f3fa755
author Elliott Hughes <enh@google.com> Fri Jun 28 23:17:20 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jun 28 23:17:20 2013 +0000
tree ff73badf3ba97fafd763d430e3b56d892966143b
parent ee66531f2fa2b6aaa5ca064062f5e8d50b64ff44
parent 0e88a9548078da56a1d434425916a2074e6f5aa1

Merge "Track libcore API update."

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 3f81c04..54edf64 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -34849,6 +34849,15 @@
     method public int getInputLength();
   }
 
+  public final class StandardCharsets {
+    field public static final java.nio.charset.Charset ISO_8859_1;
+    field public static final java.nio.charset.Charset US_ASCII;
+    field public static final java.nio.charset.Charset UTF_16;
+    field public static final java.nio.charset.Charset UTF_16BE;
+    field public static final java.nio.charset.Charset UTF_16LE;
+    field public static final java.nio.charset.Charset UTF_8;
+  }
+
   public class UnmappableCharacterException extends java.nio.charset.CharacterCodingException {
     ctor public UnmappableCharacterException(int);
     method public int getInputLength();