commit 0ad4df1dab5b64f51923cbb7b3eb2e1ee9c55095
author Irfan Sheriff <isheriff@google.com> Fri Apr 19 09:10:57 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Apr 19 09:10:57 2013 -0700
tree 0211607de2c600b5d6167f002909d3be1e302f59
parent cffd753e7b4f5fbb673e5a57b24799f92d931806
parent 28230f8b270d28b9628e41722d846a4cccbcb994

am 28230f8b: am 9b3ebb12: Merge "Update API" into jb-mr2-dev

* commit '28230f8b270d28b9628e41722d846a4cccbcb994':
  Update API

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 8203fd9..a676523 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -14003,7 +14003,7 @@
     method public deprecated android.net.DhcpInfo getDhcpInfo();
     method public java.util.List<android.net.wifi.ScanResult> getScanResults();
     method public int getWifiState();
-    method public boolean isScanningAlwaysAvailable();
+    method public boolean isScanAlwaysAvailable();
     method public boolean isWifiEnabled();
     method public boolean pingSupplicant();
     method public boolean reassociate();