Nathan Harold 353d7558b9 Merge "Catch IllegalArgumentException on NetworkScan.stopScan" am: 84c2b6a843 ...

am: b4b64bbbdd

Change-Id: Ic2bcbc4e0ed9a0154699da43b504c93847f4b513

2018-09-27 17:28:05 -07:00

..

android

Merge "Catch IllegalArgumentException on NetworkScan.stopScan" am: 84c2b6a843

2018-09-27 17:28:05 -07:00

com/android

Merge "Cleanup deprecated or removed telephony methods."

2018-09-26 15:05:47 -07:00