tree 0a702c3917cf651edfb29ab68e7ffe1a026b79c0
parent cfe099b01d676357a44c6fbfe3bd646319e97300
parent ae3bae715e6fd594d0ccefb66772e6fe1b8d303b
author Peter Qiu <zqiu@google.com> 1490650193 +0000
committer android-build-merger <android-build-merger@google.com> 1490650193 +0000

Merge "wifi: catch UnsupportedOperationException for getMatchingWifiConfig"
am: ae3bae715e

Change-Id: If47b5c5fae03ad2e6a68771da893acaad743fcbd