tree 1c5a3b40af3e8c24cdcb88ea049f8f2e228b4135
parent 1d978329df70f3b9a646a0feddf6972a1a76a262
parent bc3fefbacd7c11d147e192f7b3324f1f4dc53b51
author Peter Qiu <zqiu@google.com> 1490650706 +0000
committer android-build-merger <android-build-merger@google.com> 1490650706 +0000

Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig" am: ae3bae715e am: 78eeb9b090
am: bc3fefbacd

Change-Id: I2fa6998d854ca61aa18ef2e61ed6a7196ed0be4d