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:e8c6850fcf-s ours am skip reason: change_id I070b16661bc72a5c5035b0b227821b680d7d71ba with SHA15ac5569516is in history Change-Id: Ia789c8a5677d8235c5637299ae9e1bf8b37f81d0
This commit is contained in: