Merge "[automerger skipped] Merge "Add test for WifiInfo#getFrequency()" into qt-dev am: fd409edeca -s ours am: 26e815023f -s ours
am:1d25609428-s ours am skip reason: change_id Ie99011acbbe66e9088f73964fd0c39d640594011 with SHA19c97c58656is in history Change-Id: Ie3f82a51ce529387e025f7322d2f7c746f4ad12c
This commit is contained in: