commit a45e98974e571ca539436b295a98d513faa10d19
author Jeff Davidson <jpd@google.com> Wed Nov 05 23:19:44 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Nov 05 23:19:44 2014 +0000
tree 71024cd51e47e03ef361798c339f5dd243b72670
parent a3fdc18fd7a8191d7452e63823d7c4589dd5c894
parent 8cae7f644c59f0200f1962abdfbc6001166a192c

am 8cae7f64: am 8fe7676e: Merge "Fix incorrect doc for WifiInfo#getSSID()." into lmp-mr1-dev

* commit '8cae7f644c59f0200f1962abdfbc6001166a192c':
  Fix incorrect doc for WifiInfo#getSSID().

wifi/java/android/net/wifi/WifiInfo.java

diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java
index 5bf3470..75198e5 100644
--- a/wifi/java/android/net/wifi/WifiInfo.java
+++ b/wifi/java/android/net/wifi/WifiInfo.java
@@ -286,7 +286,7 @@
      * Returns the service set identifier (SSID) of the current 802.11 network.
      * If the SSID can be decoded as UTF-8, it will be returned surrounded by double
      * quotation marks. Otherwise, it is returned as a string of hex digits. The
-     * SSID may be {@code null} if there is no network currently connected.
+     * SSID may be <unknown ssid> if there is no network currently connected.
      * @return the SSID
      */
     public String getSSID() {