Merge "Fix build"

2013-01-15 10:13:53 -08:00
parent fef45db2aa 86ee9640ee
commit 8217635056
1 changed files with 1 additions and 2 deletions
--- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
+++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
@@ -100,7 +100,7 @@ public class WifiEnterpriseConfig implements Parcelable {
        return 0;
    }

-    /** @Override */
+    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeInt(mFields.size());
        for (Map.Entry<String, String> entry : mFields.entrySet()) {
@@ -109,7 +109,6 @@ public class WifiEnterpriseConfig implements Parcelable {
        }
    }

-    /** @Override */
    public static final Creator<WifiEnterpriseConfig> CREATOR =
            new Creator<WifiEnterpriseConfig>() {
                public WifiEnterpriseConfig createFromParcel(Parcel in) {