tree 71024cd51e47e03ef361798c339f5dd243b72670
parent a3fdc18fd7a8191d7452e63823d7c4589dd5c894
parent 8cae7f644c59f0200f1962abdfbc6001166a192c
author Jeff Davidson <jpd@google.com> 1415229584 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415229584 +0000

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

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