commit acab7adb843fb0c7d3e80c1f22ea21504b35c048
author Rubin Xu <rubinxu@google.com> Wed Jan 27 01:31:43 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 27 01:31:43 2016 +0000
tree e0468e27c7a983f629551c04b21bd6bd490d7961
parent f3e87908cda00443167722b07b473ee96c4da39a
parent c1dd4de11cfd20a84b1436f4e577c77fcbc1551b

Merge "Fix build breakage"

api/test-current.txt

diff --git a/api/test-current.txt b/api/test-current.txt
index d9e8907..3348468 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -23965,6 +23965,7 @@
     method public java.lang.String getAltSubjectMatch();
     method public java.lang.String getAnonymousIdentity();
     method public java.security.cert.X509Certificate getCaCertificate();
+    method public java.security.cert.X509Certificate[] getCaCertificates();
     method public java.security.cert.X509Certificate getClientCertificate();
     method public java.lang.String getDomainSuffixMatch();
     method public int getEapMethod();
@@ -23977,6 +23978,7 @@
     method public void setAltSubjectMatch(java.lang.String);
     method public void setAnonymousIdentity(java.lang.String);
     method public void setCaCertificate(java.security.cert.X509Certificate);
+    method public void setCaCertificates(java.security.cert.X509Certificate[]);
     method public void setClientKeyEntry(java.security.PrivateKey, java.security.cert.X509Certificate);
     method public void setDomainSuffixMatch(java.lang.String);
     method public void setEapMethod(int);