summaryrefslogtreecommitdiffstats
path: root/wifi
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2013-01-15 10:13:53 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-01-15 10:13:53 -0800
commit8217635056efa9fb285bd4a0eb26a1789c5cd557 (patch)
tree6c5ae5d5e989ab7383c1a10f4ea4b7911671bf88 /wifi
parentfef45db2aa3271bc414794ffb9c34d7659dccb1a (diff)
parent86ee9640ee6d6bd9bb655af830eea5515400f25b (diff)
downloadframeworks_base-8217635056efa9fb285bd4a0eb26a1789c5cd557.zip
frameworks_base-8217635056efa9fb285bd4a0eb26a1789c5cd557.tar.gz
frameworks_base-8217635056efa9fb285bd4a0eb26a1789c5cd557.tar.bz2
Merge "Fix build"
Diffstat (limited to 'wifi')
-rw-r--r--wifi/java/android/net/wifi/WifiEnterpriseConfig.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
index 788cb9b..46e446e 100644
--- 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) {