OSDN Git Service

Merge "Expose the scan API and network select API." am: 761b7b50d1 am: a9083c3145
authorYing Xu <yinxu@google.com>
Fri, 22 Dec 2017 01:26:53 +0000 (01:26 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Dec 2017 01:26:53 +0000 (01:26 +0000)
commit5f51741ae2fc4bf8887e41e3129c55d6fe0d94b6
treef0968dfbf1e8de3b904afbb07bf7bee1cd76325c
parent285eb8a804e9bbf474d235761140ebe6631093f3
parent3fc3857a736aa3cfe986669011898569763501a0
Merge "Expose the scan API and network select API." am: 761b7b50d1 am: a9083c3145
am: 3fc3857a73

Change-Id: I90d8d01ecedfa7993852041a7da811899f71cb64
api/current.txt
telephony/java/android/telephony/TelephonyManager.java
telephony/java/com/android/internal/telephony/ITelephony.aidl