commit 949b25423ea74d8079100cdae4e113c328b2f6cf
author Robert Greenwalt <rgreenwalt@google.com> Thu Sep 04 21:08:09 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Sep 04 21:08:11 2014 +0000
tree b5dcbff29f6ac0bc6261357fef3acaec7b179049
parent f098cfcbbe5545f991e33432b188aa54c74443f4
parent ea266c65ee2412675fdb90e81478b93db2ccd272

Merge "Catch creation of NetworkRequest without NetCap" into lmp-dev

core/java/android/net/ProxyInfo.java

diff --git a/core/java/android/net/ProxyInfo.java b/core/java/android/net/ProxyInfo.java
index 7ea6bae..1534e2c 100644
--- a/core/java/android/net/ProxyInfo.java
+++ b/core/java/android/net/ProxyInfo.java
@@ -334,10 +334,6 @@
         dest.writeStringArray(mParsedExclusionList);
     }
 
-    /**
-     * Implement the Parcelable interface.
-     * @hide
-     */
     public static final Creator<ProxyInfo> CREATOR =
         new Creator<ProxyInfo>() {
             public ProxyInfo createFromParcel(Parcel in) {