summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-06-28 16:01:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-28 16:01:51 -0700
commit5d2d22221a61258ff7dad29792bbf1201c746e8d (patch)
tree770f8d765eb6294d707966dea31962d7b0e2479b /api
parent34ba52a060b01b5d91a64d8e7026387749c2bbb6 (diff)
parentce566b5068bb73b7e379bb40c3eb74922000bbd9 (diff)
downloadframeworks_base-5d2d22221a61258ff7dad29792bbf1201c746e8d.zip
frameworks_base-5d2d22221a61258ff7dad29792bbf1201c746e8d.tar.gz
frameworks_base-5d2d22221a61258ff7dad29792bbf1201c746e8d.tar.bz2
am ce566b50: am ee66531f: Merge "Track libcore API update."
* commit 'ce566b5068bb73b7e379bb40c3eb74922000bbd9': Track libcore API update.
Diffstat (limited to 'api')
-rw-r--r--api/current.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 5028161..93e2b73 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -42436,7 +42436,9 @@ package java.util.zip {
public class GZIPOutputStream extends java.util.zip.DeflaterOutputStream {
ctor public GZIPOutputStream(java.io.OutputStream) throws java.io.IOException;
+ ctor public GZIPOutputStream(java.io.OutputStream, boolean) throws java.io.IOException;
ctor public GZIPOutputStream(java.io.OutputStream, int) throws java.io.IOException;
+ ctor public GZIPOutputStream(java.io.OutputStream, int, boolean) throws java.io.IOException;
field protected java.util.zip.CRC32 crc;
}